diff options
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 3 |
4 files changed, 7 insertions, 4 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.039" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.040" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> 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; |