diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-08-07 20:33:53 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-08-07 20:33:53 -0400 |
| commit | c854d6c9189298487cd698934f96be28b1bc9bad (patch) | |
| tree | c3563b85c2382470992a529442c41c8eeb80e63b /www/js/DataModel.js | |
| parent | 3aa6aed4d45f536a93f1b25432cd41f47a1ce466 (diff) | |
Lots of refactoring - API is not tied into Portal Auth - bugs may need to be ironed out
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 695ebd18..a79a6cd0 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -7,7 +7,7 @@ // that many other controllers use // It's grown over time. I guess I may have to split this into multiple services in the future -angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm',function ($http, $q, $ionicLoading, $ionicBackdrop,$fileLogger,zm) { +angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm','$rootScope',function ($http, $q, $ionicLoading, $ionicBackdrop,$fileLogger,zm, $rootScope) { var zmAppVersion="unknown"; var monitorsLoaded = 0; @@ -293,6 +293,10 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion maxWidth: 200, showDelay: 0 }); + + + + var d = $q.defer(); if ((monitorsLoaded == 0) || (forceReload == 1)) // monitors are empty or force reload { |