summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/LoginCtrl.js1
-rw-r--r--www/js/MonitorCtrl.js6
2 files changed, 7 insertions, 0 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index 28f16670..a13941c6 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -529,6 +529,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
}
NVRDataModel.setLogin($scope.loginData);
+
$rootScope.runMode = NVRDataModel.getBandwidth();
oldName = $scope.loginData.serverName;
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index fbfef879..c14e7e65 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -283,6 +283,10 @@ angular.module('zmApp.controllers')
// console.log("**VIEW ** Monitor Ctrl Entered");
$scope.monitors = [];
$scope.monitors = message;
+
+ //console.log (">>>>>>>>>>>> MONITOR CTRL " + JSON.stringify($scope.monitors));
+
+
if ($scope.monitors.length == 0) {
$rootScope.zmPopup = $ionicPopup.alert({
@@ -380,6 +384,8 @@ angular.module('zmApp.controllers')
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
$scope.isControllable = controllable;
+
+ $rootScope.modalRand = Math.floor(Math.random() * (999999 - 111111 + 1)) + 111111;
// This is a modal to show the monitor footage