summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/DataModel.js8
-rw-r--r--www/js/EventCtrl.js20
-rw-r--r--www/js/EventModalCtrl.js2
-rw-r--r--www/js/EventsModalGraphCtrl.js2
-rw-r--r--www/js/MontageCtrl.js2
-rw-r--r--www/js/PortalLoginCtrl.js9
-rw-r--r--www/js/TimelineCtrl.js2
-rwxr-xr-xwww/js/app.js10
8 files changed, 25 insertions, 30 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 168c29f1..a2eac7ea 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1885,7 +1885,7 @@ angular.module('zmApp.controllers')
if (forceReload == 1 || configParams.ZM_EVENT_IMAGE_DIGITS == '-1') {
var apiurl = loginData.apiurl;
var myurl = apiurl + '/configs/viewByName/ZM_EVENT_IMAGE_DIGITS.json';
- debug("Config URL for digits is:" + myurl);
+ //debug("Config URL for digits is:" + myurl);
$http.get(myurl)
.then(function (data) {
data = data.data;
@@ -1903,8 +1903,8 @@ angular.module('zmApp.controllers')
return (d.promise);
});
} else {
- log("ZM_EVENT_IMAGE_DIGITS is already configured for " +
- configParams.ZM_EVENT_IMAGE_DIGITS);
+ // log("ZM_EVENT_IMAGE_DIGITS is already configured for " +
+ // configParams.ZM_EVENT_IMAGE_DIGITS);
d.resolve(configParams.ZM_EVENT_IMAGE_DIGITS);
return (d.promise);
}
@@ -2939,7 +2939,7 @@ angular.module('zmApp.controllers')
$rootScope.authSession = "undefined";
- console.log("CURRENT SERVER: " + loginData.currentServerVersion);
+ // console.log("CURRENT SERVER: " + loginData.currentServerVersion);
if (loginData.currentServerVersion && (versionCompare(loginData.currentServerVersion, zm.versionWithLoginAPI) != -1 || loginData.loginAPISupported)) {
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index cce81b3a..ef70fcf6 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -103,7 +103,7 @@ angular.module('zmApp.controllers')
//
window.addEventListener("resize", recomputeThumbSize, false);
$ionicListDelegate.canSwipeItems(true);
- NVRDataModel.debug("enabling options swipe");
+ // NVRDataModel.debug("enabling options swipe");
// see if we come from monitors, if so, don't filter events
if ($ionicHistory.backTitle() == 'Monitors') {
@@ -159,7 +159,7 @@ angular.module('zmApp.controllers')
NVRDataModel.debug("EventCtrl: Deregistering resize listener");
window.removeEventListener("resize", recomputeThumbSize, false);
- NVRDataModel.debug("EventCtrl: Deregistering broadcast handles");
+ //NVRDataModel.debug("EventCtrl: Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
// broadcastHandles[i]();
}
@@ -205,7 +205,7 @@ angular.module('zmApp.controllers')
if (NVRDataModel.getLogin().enableThumbs) {
- NVRDataModel.debug("--> thumbnail means increasing row size");
+ // NVRDataModel.debug("--> thumbnail means increasing row size");
eventsListScrubHeight = 370;
eventsListDetailsHeight = 330;
@@ -1821,7 +1821,7 @@ angular.module('zmApp.controllers')
var af = "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0);
var apiurl = ld.apiurl + "/events/consoleEvents/1 hour" + af + ".json";
- NVRDataModel.debug("consoleEvents API:" + apiurl);
+ //NVRDataModel.debug("consoleEvents API:" + apiurl);
$http.get(apiurl)
.then(function (data) {
@@ -1858,7 +1858,7 @@ angular.module('zmApp.controllers')
});
apiurl = ld.apiurl + "/events/consoleEvents/1 day" + af + ".json";
- NVRDataModel.debug("consoleEvents API:" + apiurl);
+ //NVRDataModel.debug("consoleEvents API:" + apiurl);
$http.get(apiurl)
.then(function (data) {
data = data.data;
@@ -1891,7 +1891,7 @@ angular.module('zmApp.controllers')
});
apiurl = ld.apiurl + "/events/consoleEvents/1 week" + af + ".json";
- NVRDataModel.debug("consoleEvents API:" + apiurl);
+ //NVRDataModel.debug("consoleEvents API:" + apiurl);
$http.get(apiurl)
.then(function (data) {
data = data.data;
@@ -1925,7 +1925,7 @@ angular.module('zmApp.controllers')
});
apiurl = ld.apiurl + "/events/consoleEvents/1 month" + af + ".json";
- NVRDataModel.debug("consoleEvents API:" + apiurl);
+ //NVRDataModel.debug("consoleEvents API:" + apiurl);
$http.get(apiurl)
.then(function (data) {
data = data.data;
@@ -2028,7 +2028,7 @@ angular.module('zmApp.controllers')
NVRDataModel.debug("disabling options swipe");
} else {
$ionicListDelegate.canSwipeItems(true);
- NVRDataModel.debug("enabling options swipe");
+ //NVRDataModel.debug("enabling options swipe");
}
};
@@ -2070,11 +2070,11 @@ angular.module('zmApp.controllers')
if (event.Event.ShowScrub == false) {
$ionicListDelegate.canSwipeItems(true);
- NVRDataModel.debug("enabling options swipe due to toggle");
+ //NVRDataModel.debug("enabling options swipe due to toggle");
} else {
$ionicListDelegate.canSwipeItems(false);
$ionicListDelegate.closeOptionButtons();
- NVRDataModel.debug("disabling options swipe due to toggle");
+ // NVRDataModel.debug("disabling options swipe due to toggle");
}
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 7bd049a5..4097b92d 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1303,7 +1303,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
}
- NVRDataModel.debug("Deregistering broadcast handles");
+ // NVRDataModel.debug("Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
// broadcastHandles[i]();
}
diff --git a/www/js/EventsModalGraphCtrl.js b/www/js/EventsModalGraphCtrl.js
index b4e82ee2..0cfacb68 100644
--- a/www/js/EventsModalGraphCtrl.js
+++ b/www/js/EventsModalGraphCtrl.js
@@ -23,7 +23,7 @@ angular.module('zmApp.controllers').controller('EventsModalGraphCtrl', ['$scope'
$scope.$on('modal.removed', function (e, m) {
- NVRDataModel.debug("Deregistering broadcast handles");
+ //NVRDataModel.debug("Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
// broadcastHandles[i]();
}
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index dd574704..ec569943 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -2026,7 +2026,7 @@ angular.module('zmApp.controllers')
currentStreamState = streamState.STOPPED;
viewCleanup();
viewCleaned = true;
- NVRDataModel.debug("Deregistering broadcast handles");
+ //NVRDataModel.debug("Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
broadcastHandles[i]();
}
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 1b2032b2..f514917e 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -11,23 +11,18 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic
$scope.$on('$ionicView.beforeLeave', function () {
processPush = false;
- // NVRDataModel.debug ("BeforeEnter in Portal: setting ProcessPush to false");
+
});
-
-
-
-
$scope.$on ( "process-push", function () {
processPush = true;
-
NVRDataModel.debug (">> PortalLogin: push handler, marking to resolve later");
});
$scope.$on('$ionicView.beforeLeave', function () {
- NVRDataModel.debug("Portal: Deregistering broadcast handles");
+ //NVRDataModel.debug("Portal: Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
//broadcastHandles[i]();
}
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index a75199f4..f6125fb6 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -295,7 +295,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
}
- NVRDataModel.debug("Timeline: Deregistering broadcast handles");
+ //NVRDataModel.debug("Timeline: Deregistering broadcast handles");
for (var i = 0; i < broadcastHandles.length; i++) {
broadcastHandles[i]();
}
diff --git a/www/js/app.js b/www/js/app.js
index 8bbe4d1b..fd772197 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1009,7 +1009,7 @@ angular.module('zmApp', [
proceedWithLogin()
.then(function (success) {
- NVRDataModel.debug("Storing login time as " + moment().toString());
+ //NVRDataModel.debug("Storing login time as " + moment().toString());
localforage.setItem("lastLogin", moment().toString());
d.resolve(success);
return d.promise;
@@ -1813,7 +1813,7 @@ angular.module('zmApp', [
toState.name != "app.zm-portal-login"
) {
- NVRDataModel.debug("Setting last-desktop-state to:" + JSON.stringify(toState));
+ // NVRDataModel.debug("Setting last-desktop-state to:" + JSON.stringify(toState));
localforage.setItem('last-desktop-state', {
'name': toState.name,
'params': toState.params
@@ -1852,7 +1852,7 @@ angular.module('zmApp', [
// to work in Windows
- NVRDataModel.debug("Setting last-desktop-state to:" + JSON.stringify(toState) + " with params:" + JSON.stringify(toParams));
+ //NVRDataModel.debug("Setting last-desktop-state to:" + JSON.stringify(toState) + " with params:" + JSON.stringify(toParams));
localforage.setItem('last-desktop-state', {
'name': toState,
'params': toParams
@@ -2204,8 +2204,8 @@ angular.module('zmApp', [
$rootScope.lastState = $ionicHistory.currentView().stateName;
$rootScope.lastStateParam =
$ionicHistory.currentView().stateParams;
- NVRDataModel.debug("Last State recorded:" +
- JSON.stringify($ionicHistory.currentView()));
+ //NVRDataModel.debug("Last State recorded:" +
+ //JSON.stringify($ionicHistory.currentView()));
if ($rootScope.lastState == "app.zm-portal-login") {
NVRDataModel.debug("Last state was portal-login, so forcing montage");
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 16:58:31 +0000