From c76ead47d1b4474e8cef477a918639fa44d835f1 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Sat, 5 Dec 2015 15:44:27 -0500 Subject: 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 --- www/js/DataModel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/DataModel.js') 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);}); -- cgit v1.2.3