summaryrefslogtreecommitdiff
path: root/www/js/MontageHistoryCtrl2.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-10-05 14:28:58 -0400
committerPliable Pixels <pliablepixels@gmail.com>2016-10-05 14:28:58 -0400
commitaa399523b29bb1cdbff9ed082dd919409bb0e30f (patch)
tree97132eb433a73c2c18bbda22e323944ef8206f0b /www/js/MontageHistoryCtrl2.js
parent43eaa42c6708c2d1280b94e09f91bcbf819fbbd3 (diff)
tweaks to packery
Former-commit-id: ee6a0147819ee24195b8be8b6d58ac177c617ef1
Diffstat (limited to 'www/js/MontageHistoryCtrl2.js')
-rw-r--r--www/js/MontageHistoryCtrl2.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/MontageHistoryCtrl2.js b/www/js/MontageHistoryCtrl2.js
index d9107a0f..cf621f9f 100644
--- a/www/js/MontageHistoryCtrl2.js
+++ b/www/js/MontageHistoryCtrl2.js
@@ -1283,7 +1283,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
imagesLoaded(elem).once('always', function () {
console.log("******** ALL IMAGES LOADED");
NVRDataModel.debug("All images loaded");
- $scope.allImagesLoaded = true;
+
$ionicLoading.hide();
@@ -1340,6 +1340,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
$timeout(function () {
NVRDataModel.log("Force calling resize");
pckry.layout();
+ $scope.allImagesLoaded = true;
}, zm.packeryTimer); // don't ask