From 03934c48067fc485b56ef25ec93b302451bdd5c5 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 15 Dec 2018 05:42:32 -0500 Subject: nits --- config.xml | 2 +- package.json | 4 ++-- www/js/DataModel.js | 2 +- www/js/MontageCtrl.js | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config.xml b/config.xml index 2937313d..df7f222f 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client diff --git a/package.json b/package.json index 18336f97..cef6619c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.039", + "version":"1.3.040", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -180,4 +180,4 @@ ] } } -} \ No newline at end of file +} diff --git a/www/js/DataModel.js b/www/js/DataModel.js index d1dbf61c..8ce71772 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.039"; + var zmAppVersion = "1.3.040"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 3ff8d85d..5ec2ed41 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -197,6 +197,9 @@ angular.module('zmApp.controllers') function forceReloadPage() { + + //return; + if ($scope.isDragabillyOn) { NVRDataModel.debug("not reloading, edit in progress"); return; -- cgit v1.2.3