diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MontageCtrl.js | 29 | ||||
| -rw-r--r-- | www/js/NVR.js | 2 |
2 files changed, 16 insertions, 15 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 9353dbe1..c2bc8d3b 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -441,22 +441,23 @@ angular.module('zmApp.controllers') } NVR.debug("All images loaded, doing image layout"); - - } - $timeout(function () { - //NVR.log("Force calling resize"); - ///pckry.reloadItems(); - ///positions is defined only if layouttype was false - //(">>> Positions is " + JSON.stringify(positions)); - if (!layouttype && positions) pckry.initShiftLayout(positions, "data-item-id"); - // now do a jiggle $timeout(function () { - NVR.debug("inside drag items:doing the jiggle and dance..."); - pckry.shiftLayout(); - //$scope.squeezeMonitors(); - }, 500); + //NVR.log("Force calling resize"); + ///pckry.reloadItems(); + ///positions is defined only if layouttype was false + //(">>> Positions is " + JSON.stringify(positions)); + if (!layouttype && positions) pckry.initShiftLayout(positions, "data-item-id"); + // now do a jiggle + $timeout(function () { + NVR.debug("inside drag items:doing the jiggle and dance..."); + pckry.shiftLayout(); + //$scope.squeezeMonitors(); + }, 500); + + }, 100); - }, 100); + } + //pckry.onresize(); diff --git a/www/js/NVR.js b/www/js/NVR.js index 7ff298dc..6f9fad88 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.065"; + var zmAppVersion = "1.3.066"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; |