summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2017-02-06 03:59:32 -0500
committerPliable Pixels <pliablepixels@gmail.com>2017-02-06 03:59:32 -0500
commit1c4c12af513ae9208ce92d34e1557e143ed8f0ef (patch)
treebbe6028e551af4b18a8e46b95bc1c373e595e40a
parente2c87f9bb24181b1a9daffd7892c4666479b8a19 (diff)
minor release tweaks
-rw-r--r--config.xml2
-rw-r--r--www/js/MonitorModalCtrl.js9
-rw-r--r--www/js/MontageHistoryCtrl.js1
-rw-r--r--www/templates/monitors-modal.html2
4 files changed, 9 insertions, 5 deletions
diff --git a/config.xml b/config.xml
index 80498d92..cc78c603 100644
--- a/config.xml
+++ b/config.xml
@@ -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.35" 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.36" 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/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index a41cb04d..4d2abd63 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -1416,7 +1416,9 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
$scope.toggleListMenu = function()
{
+
$scope.isToggleListMenu = !$scope.isToggleListMenu;
+ //console.log ("isToggleListMenu:"+$scope.isToggleListMenu);
};
//-------------------------------------------------------------
@@ -1691,14 +1693,15 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
$scope.monStatus = "";
$scope.isToggleListMenu = true;
+ //console.log (">>>>>>>>>>>>>>>>>>>STOOOP");
document.addEventListener("pause", onPause, false);
document.addEventListener("resume", onResume, false);
- document.addEventListener("mouseup", moveStop, false);
+ /*document.addEventListener("mouseup", moveStop, false);
document.addEventListener("touchend", moveStop, false);
- document.addEventListener("mousemove", moveContinue, false);
- document.addEventListener("touchmove", moveContinue, false);
+ document.addEventL`istener("mousemove", moveContinue, false);
+ document.addEventListener("touchmove", moveContinue, false);*/
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 4c7851d5..8aff342e 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -292,6 +292,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
{
mid = data.events[i].Event.MonitorId;
eid = data.events[i].Event.Id;
+ //console.log ("Event ID:"+eid);
stime = data.events[i].Event.StartTime;
// only take the first one for each monitor
for (var j = 0; j < $scope.MontageMonitors.length; j++)
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index f5eccca3..0ddbe370 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -103,7 +103,7 @@
<ul>
<li>
- <a href="" ng-click="toggleListMenu()"> <i ng-class="(isToggleListMenu) ? 'icon ion-chevron-left': 'icon ion-chevron-right'"></i></a>
+ <a href="" ng-click="toggleListMenu()">&nbsp; <i ng-class="(isToggleListMenu) ? 'icon ion-chevron-left': 'icon ion-chevron-right'"></i>&nbsp;</a>
</li>
<li ng-if="isToggleListMenu">