Do not attempt to download topic list if offline, but still load from…

… db #69
iilab · Feb 3, 2016 · c6e5860 · c6e5860
1 parent 2bfecac
commit c6e5860
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/platforms/android/assets/www/js/controllers.js b/platforms/android/assets/www/js/controllers.js
@@ -139,7 +139,7 @@ angular.module('starter.controllers', ['starter.services'])
   var INDEX_URL = $scope.settingsData.contentUrl + '/index.json';
 
   $scope.refreshTopics = function() {
-    if($scope.allowRefresh) {
+    if($scope.allowRefresh && window.isOnline) {
       $http({
         method: 'GET',
         url: INDEX_URL,
@@ -188,6 +188,9 @@ angular.module('starter.controllers', ['starter.services'])
       });
     } else {
       //quickly return if we've disabled the refresher
+      var topics = DBService.getAllTopics();
+      $scope.topics = topics;
+      doFilter();
       $scope.$broadcast('scroll.refreshComplete');
     }
   };

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -139,7 +139,7 @@ angular.module('starter.controllers', ['starter.services'])
   var INDEX_URL = $scope.settingsData.contentUrl + '/index.json';
 
   $scope.refreshTopics = function() {
-    if($scope.allowRefresh) {
+    if($scope.allowRefresh && window.isOnline) {
       $http({
         method: 'GET',
         url: INDEX_URL,
@@ -188,6 +188,9 @@ angular.module('starter.controllers', ['starter.services'])
       });
     } else {
       //quickly return if we've disabled the refresher
+      var topics = DBService.getAllTopics();
+      $scope.topics = topics;
+      doFilter();
       $scope.$broadcast('scroll.refreshComplete');
     }
   };