diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-05 15:44:27 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-05 15:44:27 -0500 |
| commit | c76ead47d1b4474e8cef477a918639fa44d835f1 (patch) | |
| tree | 3e4c03e08590ce9d5d7e6a412d1a90f4f67229ff /www/js/DataModel.js | |
| parent | 3f9daea7bb0fa25eb894bbc068b8ccbc1397c8a5 (diff) | |
scoped all alerts to zmPopupalert so I can kill them if moved to background and resumed. show dialogs were already scoped
Former-commit-id: d32398cee403f515eb593921f266abf229aa3780
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 0a529365..ddbc65cb 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -207,7 +207,7 @@ angular.module('zmApp.controllers') if (typeof loginData.minAlarmCount === 'undefined') { - console.log ("MIN ALARM"); + zmDebug ("minAlarmCount does not exist, setting to 1"); loginData.minAlarmCount = '1'; } @@ -720,7 +720,7 @@ angular.module('zmApp.controllers') console.log ("API:"+myurl); $http.get(myurl /*,{timeout:15000}*/ ) .success(function (data) { - console.log("HTTP success got " + JSON.stringify(data.monitors)); + //console.log("HTTP success got " + JSON.stringify(data.monitors)); monitors = data.monitors; monitors.sort(function(a,b) {return parseInt(a.Monitor.Sequence)-parseInt(b.Monitor.Sequence);}); |