diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-10-31 14:20:01 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-10-31 14:20:01 -0400 |
| commit | 140b1ef1a7b110178aebe17334353fa803d2ede7 (patch) | |
| tree | b5dd5d457b63abcc6cff3742d76ba0c8b5e85b8b /www/js | |
| parent | d6a0a698ea53413643f439dcaa945b5a7c4ad095 (diff) | |
#857 flush cache when switching servers
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/LoginCtrl.js | 12 | ||||
| -rw-r--r-- | www/js/MenuController.js | 13 | ||||
| -rw-r--r-- | www/js/NVR.js | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index cd6861a8..11474f2d 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -594,6 +594,18 @@ function mobilePinConfig () { function saveItems(showalert) { + NVR.flushAPICache() + .then (function() { + _saveItems(showalert); + }) + .catch (function(err) { + NVR.debug ('Error clearing cache:'+JSON.stringify(err)); + _saveItems(showalert); + }); + + } + function _saveItems(showalert) { + //console.log ("*********** SAVE ITEMS CALLED "); //console.log('Saving login'); diff --git a/www/js/MenuController.js b/www/js/MenuController.js index 92aca6da..781fb21e 100644 --- a/www/js/MenuController.js +++ b/www/js/MenuController.js @@ -384,7 +384,18 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io } if (NVR.getLogin().serverName != $scope.newServer.val) - switchToServer($scope.newServer.val); + { + NVR.flushAPICache() + .then (function() { + switchToServer($scope.newServer.val); + }) + .catch (function(err) { + NVR.debug ('Error clearing cache:'+JSON.stringify(err)); + switchToServer($scope.newServer.val); + }); + } + + //$rootScope.$broadcast('server-changed'); diff --git a/www/js/NVR.js b/www/js/NVR.js index eb3ba08e..0d1a9bd2 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.079"; + var zmAppVersion = "1.3.080"; var zmAPIVersion = null; var isBackground = false; var justResumed = false; @@ -349,6 +349,7 @@ angular.module('zmApp.controllers') } function delete_all_caches() { + debug ('CACHE: Flushing all network API caches...'); return localforage.removeItem('cached_monitors') .then ( function () {return localforage.removeItem('cached_api_version');}) .then ( function () {return localforage.removeItem('cached_multi_servers');}) |