diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-18 14:51:47 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-18 14:51:47 -0400 |
| commit | a0d5234fe7c16d78c243079fae0b9a4798cdcd0b (patch) | |
| tree | dbdba50829d6b0972971586db112a6bb1a1b3e38 /www/js | |
| parent | 1eb4cf8dfc741d355618f3cbb0c9f6eff497808b (diff) | |
stuff
Former-commit-id: 36dc9f00cbf062a4b11bc23ec2fd644c17e2f745
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 7f468990..9e6188aa 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -995,7 +995,7 @@ angular.module('zmApp.controllers') for ( i = 0; i< monitors.length; i++) { monitors[i].Monitor.listDisplay='show'; - monitors[i].Monitor.isAlarmed = 'false'; + monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 4f4b70bc..3196acbc 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -21,7 +21,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' { $rootScope.alarmCount="0"; $ionicHistory.nextViewOptions({disableBack: true}); - ZMDataModel.zmStateGo("events", {"id": 0}, { reload: true }); + ZMDataModel.$state.("events", {"id": 0}, { reload: true }); } }; |