diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-08 14:24:52 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-08 14:24:52 -0500 |
| commit | 3f9ce8bd812de21520162d2d1ec82b664ec72257 (patch) | |
| tree | 6ff337784046ccfca4ef0a57901dd440d0a7dd54 /www | |
| parent | 3358063051cfb175d901f1882587cea1232f5c59 (diff) | |
switched to shiftLayout
Former-commit-id: e5dce3912b22aee80d2d516fa6a34a2db8dd7fc5
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MontageCtrl.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index dc02193e..b3ca6927 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -173,7 +173,8 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' $ionicLoading.hide(); $scope.sliderChanging = false; }); - pckry.layout(); + + layout(pckry); },100); @@ -222,7 +223,7 @@ function initPackery() imagesLoaded(elem).on('progress', function() { //console.log ("******** SOME IMAGE LOADED"); progressCalled = true; - if (layouttype) $timeout (function(){pckry.layout();},100); + if (layouttype) $timeout (function(){layout(pckry);},100); }); imagesLoaded(elem).on('always', function() { @@ -764,13 +765,18 @@ function initPackery() ZMDataModel.setLogin(ld); $scope.slider.monsize = 2; }); - pckry.layout(); - $timeout(function(){pckry.layout(); },100);// don't ask + layout(pckry); + $timeout(function(){layout(pckry); },100);// don't ask },100); }; + + function layout(pckry) + { + pckry.shiftLayout(); + } //--------------------------------------------------------- // slider is tied to the view slider for montage @@ -843,7 +849,7 @@ function initPackery() $ionicLoading.hide(); $scope.sliderChanging = false; }); - pckry.layout(); + layout(pckry); },100); |