Merge pull request #367 from EverythingMe/feature/offline

Fix #242: handle the case there is no connection to the server
getredash · Jan 29, 2015 · b76906b · b76906b
2 parents 3dde578 + 3960005
commit b76906b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/rd_ui/app/index.html b/rd_ui/app/index.html
@@ -18,6 +18,8 @@
     <link rel="stylesheet" href="/bower_components/angular-ui-select/dist/select.css">
     <link rel="stylesheet" href="/bower_components/pace/themes/pace-theme-minimal.css">
     <link rel="stylesheet" href="/bower_components/font-awesome/css/font-awesome.css">
+    <link rel="stylesheet" href="/bower_components/offline/themes/offline-theme-default.css">
+    <link rel="stylesheet" href="/bower_components/offline/themes/offline-language-english.css">
     <link rel="stylesheet" href="/styles/redash.css">
     <!-- endbuild -->
 </head>
@@ -127,6 +129,7 @@
 <script src="/bower_components/bucky/bucky.js"></script>
 <script src="/bower_components/pace/pace.js"></script>
 <script src="/bower_components/mustache/mustache.js"></script>
+<script src="/bower_components/offline/offline.min.js"></script>
 <!-- endbuild -->
 
 <!-- build:js({.tmp,app}) /scripts/scripts.js -->

diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js
@@ -342,6 +342,22 @@
             refreshStatus(queryResult, query, ttl);
           }, 3000);
         }
+      }, function() {
+        var upHandler = function() {
+          Offline.off('up', upHandler);
+          console.log('trying again');
+          refreshStatus(queryResult, query, ttl);
+        };
+
+        var downHandler = function() {
+          console.log('2 handling down case');
+
+          Offline.on('up', upHandler);
+          Offline.off('down', downHandler);
+        };
+
+        Offline.on('down', downHandler);
+        Offline.check();
       })
     }
 

diff --git a/rd_ui/bower.json b/rd_ui/bower.json
@@ -28,7 +28,8 @@
     "pace": "~0.5.1",
     "angular-ui-select": "0.8.2",
     "font-awesome": "~4.2.0",
-    "mustache": "~1.0.0"
+    "mustache": "~1.0.0",
+    "offline": "~0.7.11"
   },
   "devDependencies": {
     "angular-mocks": "1.2.18",