diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-08 15:38:20 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-08 15:38:20 -0500 |
| commit | 285df46e95eb1c59542bb7574fd48610b507b7e9 (patch) | |
| tree | 534520b9c479440d0d938131b7fba545dd656239 | |
| parent | 8866618d2ac6acaa250513f8db05f89566999966 (diff) | |
#179 use layout and shiftLayout correctly after testing with Android
Former-commit-id: 4075c63cddd99bd6237d98300002fa830f35ce15
| -rw-r--r-- | www/js/MontageCtrl.js | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index b3ca6927..f2fb72fd 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -745,10 +745,10 @@ function initPackery() else { $scope.MontageMonitors[i].Monitor.gridScale="20"; - somethingReset = true; + // somethingReset = true; } } - if (!somethingReset) // nothing was selected + if (!somethingReset && $scope.isDragabillyOn) // nothing was selected { for (i=0; i< $scope.MontageMonitors.length; i++){$scope.MontageMonitors[i].Monitor.gridScale="20";} } @@ -765,8 +765,9 @@ function initPackery() ZMDataModel.setLogin(ld); $scope.slider.monsize = 2; }); - layout(pckry); - $timeout(function(){layout(pckry); },100);// don't ask + //layout(pckry); + pckry.layout(); // force here - no shiftlayout + $timeout(function(){pckry.layout(); },100);// don't ask },100); @@ -819,12 +820,12 @@ function initPackery() else { $scope.MontageMonitors[i].Monitor.gridScale= curVal; - somethingReset = true; + //somethingReset = true; } } - if (!somethingReset) // nothing was selected + if (!somethingReset && $scope.isDragabillyOn) // nothing was selected { for (i=0; i< $scope.MontageMonitors.length; i++) { @@ -849,7 +850,10 @@ function initPackery() $ionicLoading.hide(); $scope.sliderChanging = false; }); - layout(pckry); + if (!somethingReset) + pckry.layout(); + else + layout(pckry); },100); |