summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-12-15 05:42:32 -0500
committerPliable Pixels <pliablepixels@gmail.com>2018-12-15 05:42:32 -0500
commit03934c48067fc485b56ef25ec93b302451bdd5c5 (patch)
tree7a7ad102462a1d2f230f48cd50c5366b6385166b /www
parent3c3fc4bbd6ca9b8026bfc6214aa96c2cc7e36ef8 (diff)
nits
Diffstat (limited to 'www')
-rw-r--r--www/js/DataModel.js2
-rw-r--r--www/js/MontageCtrl.js3
2 files changed, 4 insertions, 1 deletions
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;