diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-14 07:50:52 -0500 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-14 07:50:52 -0500 |
| commit | a1c612aaaa8945aad94ee7012014690307ab9bef (patch) | |
| tree | fa29d2978532b82ae6c2a51868cb65d17713f6bc | |
| parent | 45c42509dd21398d002ce1014a78564da3c6d765 (diff) | |
#329 - think I got it - monitors had cache on in the view
Former-commit-id: ac54a534cddc3e393760a5c21e078bea96b02bba
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 6 | ||||
| -rw-r--r-- | www/templates/monitors.html | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.22" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.23" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client 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 diff --git a/www/templates/monitors.html b/www/templates/monitors.html index 3d6a80f7..6c23e6c7 100644 --- a/www/templates/monitors.html +++ b/www/templates/monitors.html @@ -1,4 +1,4 @@ -<ion-view view-title="{{'kMonitors' | translate}}" cache="false"> +<ion-view view-title="{{'kMonitors' | translate}}" cache-view="false"> <ion-nav-buttons side="left"> <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"> </button> |