diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-07-10 11:26:54 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-07-10 11:26:54 -0400 |
| commit | 84dbaa6b65998beaeb17accbc757828af5d98e09 (patch) | |
| tree | ea6c71ec19df270ceabf2a1d8d25fd7593c0a495 | |
| parent | 5480f25f0cfa21426db740c86fada8540bcaa7f3 (diff) | |
bumped to 0.62, published to beta for android/ios, fixed a bug with ordering of hidden monitors
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<widget id="com.pliablepixels.zmninja" version="0.61" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="com.pliablepixels.zmninja" version="0.62" 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/MontageCtrl.js b/www/js/MontageCtrl.js index 66c87b23..bf4d4347 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -249,6 +249,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var refresh = ZMDataModel.getMonitors(1); refresh.then(function (data) { $scope.monitors = data; + $scope.MontageMonitors = data; oldMonitors = angular.copy($scope.monitors); var i; montageOrder = []; @@ -274,11 +275,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $scope.deleteItem = function (index) { var findindex = montageOrder.indexOf(index); // $scope.monitors[index].Monitor.Function = 'None'; - if ($scope.monitors[index].Monitor.listDisplay == 'show') { - $scope.monitors[index].Monitor.listDisplay = 'noshow'; + if ($scope.MontageMonitors[index].Monitor.listDisplay == 'show') { + $scope.MontageMonitors[index].Monitor.listDisplay = 'noshow'; hiddenOrder[findindex] = 1; } else { - $scope.monitors[index].Monitor.listDisplay = 'show'; + $scope.MontageMonitors[index].Monitor.listDisplay = 'show'; // we need to find the index of Montage Order that contains index // because remember, hiddenOrder does not change its orders as monitors // move @@ -288,7 +289,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' //window.localStorage.setItem("montageOrder", montageOrder.toString()); console.log("DELETE: Order Array now is " + montageOrder.toString()); console.log("DELETE: Hidden Array now is " + hiddenOrder.toString()); - ZMDataModel.zmLog("Marked monitor " + findindex + " as " + $scope.monitors[index].Monitor.listDisplay + " in montage"); + ZMDataModel.zmLog("Marked monitor " + findindex + " as " + $scope.MontageMonitors[index].Monitor.listDisplay + " in montage"); }; |