diff options
| -rw-r--r-- | www/external/packery.pkgd.js | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 43 |
2 files changed, 33 insertions, 14 deletions
diff --git a/www/external/packery.pkgd.js b/www/external/packery.pkgd.js index f7edb5b0..a85a10f4 100644 --- a/www/external/packery.pkgd.js +++ b/www/external/packery.pkgd.js @@ -2752,7 +2752,8 @@ Packery.prototype.getShiftPositions = function( attrName ) { attr: item.element.getAttribute( attrName ), size: item.element.getAttribute ("data-item-size"), display: item.element.getAttribute ("data-item-listdisplay"), - x: item.rect.x / _this.packer.width + x: item.rect.x / _this.packer.width, + y: item.rect.y / _this.packer.height } }); }; @@ -2782,6 +2783,7 @@ Packery.prototype.initShiftLayout = function( positions, attr ) { var itemElem = this.element.querySelector( selector ); var item = this.getItem( itemElem ); item.rect.x = itemPosition.x * this.packer.width; + item.rect.y = itemPosition.y * this.packer.height; return item; }, this ); this.shiftLayout(); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 9f5ed051..db79082e 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -198,7 +198,7 @@ function initPackery() ZMDataModel.zmDebug ("All images loaded, doing image layout"); - pckry.initShiftLayout(positions, 'data-item-id'); + $timeout (function() {pckry.initShiftLayout(positions, 'data-item-id');},0); } $timeout(function(){ZMDataModel.zmLog ("Force calling resize"); pckry.shiftLayout();},300);// don't ask @@ -1023,6 +1023,8 @@ $scope.$on('$ionicView.afterEnter', function () { $scope.sliderChanging = true; var somethingReset = false; + + // this only changes items that are selected for (var i=0; i< $scope.MontageMonitors.length; i++) { @@ -1050,6 +1052,8 @@ $scope.$on('$ionicView.afterEnter', function () { } } + + // this changes all items if none were selected if (!somethingReset && $scope.isDragabillyOn) // nothing was selected { for (i=0; i< $scope.MontageMonitors.length; i++) @@ -1063,24 +1067,37 @@ $scope.$on('$ionicView.afterEnter', function () { } - $timeout(function () { - + //pckry.reloadItems(); + pckry.once( 'layoutComplete', function() { - var positions = pckry.getShiftPositions('data-item-id'); - console.log ("POSITIONS MAP " + JSON.stringify(positions)); - var ld = ZMDataModel.getLogin(); - ld.packeryPositions = JSON.stringify(positions); - ZMDataModel.setLogin(ld); - $ionicLoading.hide(); - $scope.sliderChanging = false; + $timeout(function () { + var positions = pckry.getShiftPositions('data-item-id'); + console.log ("POSITIONS MAP " + JSON.stringify(positions)); + var ld = ZMDataModel.getLogin(); + ld.packeryPositions = JSON.stringify(positions); + ZMDataModel.setLogin(ld); + $ionicLoading.hide(); + $scope.sliderChanging = false; + },100); }); + + + if (!somethingReset) - pckry.layout(); + { + console.log (">>>SOMETHING NOT RESET"); + $timeout(function() {pckry.layout();},300); + } else - layout(pckry); - },100); + { + + console.log (">>>SOMETHING RESET"); + $timeout(function() {layout(pckry);},300); + } + + }; |