diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageCtrl.js | 22 | ||||
| -rw-r--r-- | www/js/app.js | 1 |
2 files changed, 13 insertions, 10 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index d463ed8d..f073d836 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -200,11 +200,11 @@ function initPackery() ZMDataModel.zmDebug ("All images loaded, doing image layout"); $timeout (function() {pckry.initShiftLayout(positions, 'data-item-id');},0); } - $timeout(function(){ZMDataModel.zmLog ("Force calling resize"); pckry.shiftLayout();},300);// don't ask + $timeout(function(){ZMDataModel.zmLog ("Force calling resize"); pckry.shiftLayout();},zm.packeryTimer);// don't ask - },300); + },zm.packeryTimer); }); @@ -701,10 +701,10 @@ function initPackery() }); + // we don't really need this as we have stopped the timer + // $scope.isModalActive = true; - $scope.isModalActive = true; - - + //$timeout (function() {pckry.shiftLayout();},zm.packeryTimer); $scope.modal.show(); }); @@ -744,6 +744,8 @@ function initPackery() // console.log ("Refreshing Image..."); }.bind(this), 5000); + // $timeout (function() {pckry.shiftLayout();},zm.packeryTimer); + }; @@ -928,7 +930,7 @@ $scope.$on('$ionicView.afterEnter', function () { console.log("**VIEW ** Montage Ctrl AFTER ENTER"); window.addEventListener("resize", orientationChanged, false); - $timeout ( function () {initPackery(); },500); + $timeout ( function () {initPackery(); },zm.packeryTimer); document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); @@ -1005,7 +1007,7 @@ $scope.$on('$ionicView.afterEnter', function () { // $scope.slider.monsize = 2; }); //layout(pckry); - $timeout (function(){pckry.layout();}); // force here - no shiftlayout + $timeout (function(){pckry.layout();},zm.packeryTimer); // force here - no shiftlayout },100); @@ -1092,7 +1094,7 @@ $scope.$on('$ionicView.afterEnter', function () { ZMDataModel.setLogin(ld); $ionicLoading.hide(); $scope.sliderChanging = false; - },100); + },zm.packeryTimer); }); @@ -1100,13 +1102,13 @@ $scope.$on('$ionicView.afterEnter', function () { if (!somethingReset) { console.log (">>>SOMETHING NOT RESET"); - $timeout(function() {pckry.layout();},300); + $timeout(function() {pckry.layout();},zm.packeryTimer); } else { console.log (">>>SOMETHING RESET"); - $timeout(function() {layout(pckry);},300); + $timeout(function() {layout(pckry);},zm.packeryTimer); } diff --git a/www/js/app.js b/www/js/app.js index 74c2fb66..ef8c1990 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -76,6 +76,7 @@ angular.module('zmApp', [ nphSwitchTimer: 3000, eventHistoryTimer: 10000, eventPlaybackQuery: 3000, + packeryTimer:500 |