Merge pull request #349 from pliablepixels/montage-jazz

Montage jazz

Former-commit-id: ba1be6c70c55a7274d980d9b418b8bc385704ba2

2 files changed, 14 insertions, 3 deletions

diff --git a/www/external/ion-pullup.js b/www/external/ion-pullup.js
index 9bd5ab56..ae9109a8 100755
--- a/www/external/ion-pullup.js
+++ b/www/external/ion-pullup.js
@@ -45,10 +45,18 @@ angular.module('ionic-pullup', [])
                   header = document.querySelector('.bar-header');
                   tabsHeight = tabs ? tabs.offsetHeight : 0;
                   headerHeight = header ? header.offsetHeight : 0;
+
+                  /*if ($rootScope.platformOS == 'ios')
+                  {
+                          tabsHeight +=40;
+                          headerHeight +=40;
+                  }*/
               }
 
               function computeHeights() {
                   footer.height = footer.maxHeight > 0 ? footer.maxHeight : $window.innerHeight - headerHeight - handleHeight - tabsHeight;
+                  if ($rootScope.platformOS == 'ios') footer.height -=60;
+                  if ($rootScope.platformOS == 'android') footer.height -=40;
                   $element.css({'height': footer.height + 'px'});
 
                   if (footer.initialState == FooterState.MINIMIZED) {
@@ -69,6 +77,8 @@ angular.module('ionic-pullup', [])
               function recomputeAllHeights() {
                   computeDefaultHeights();
                   footer.height = footer.maxHeight > 0 ? footer.maxHeight : $window.innerHeight - headerHeight - handleHeight - tabsHeight;
+                  if ($rootScope.platformOS == 'ios') footer.height -=60;
+                  if ($rootScope.platformOS == 'android') footer.height -=40;
                 }
 
               function expand() {
diff --git a/www/external/packery.pkgd.js b/www/external/packery.pkgd.js
index 86cb6932..7576576b 100644
--- a/www/external/packery.pkgd.js
+++ b/www/external/packery.pkgd.js
@@ -285,7 +285,8 @@ function setup() {
   body.appendChild( div );
   var style = getStyle( div );
 
-  getSize.isBoxSizeOuter = isBoxSizeOuter = getStyleSize( style.width ) == 200;
+  //PP https://github.com/metafizzy/packery/pull/382/commits/ea595864bfc161e992bcb28cbce132df9eac57b9
+  getSize.isBoxSizeOuter = isBoxSizeOuter = Math.round(getStyleSize( style.width )) == 200;
   body.removeChild( div );
 
 }
@@ -2797,8 +2798,8 @@ Packery.prototype.initShiftLayout = function( positions, attr ) {
     var selector = '[' + attr + '="' + itemPosition.attr  + '"]'
     var itemElem = this.element.querySelector( selector );
     var item = this.getItem( itemElem );
-    //item.rect.x = itemPosition.x * this.packer.width;
-    item.rect.x = Math.ceil(itemPosition.x * this.packer.width);
+    item.rect.x = itemPosition.x * this.packer.width;
+    //item.rect.x = Math.ceil(itemPosition.x * this.packer.width);
     item.rect.y = itemPosition.y * this.packer.height;
     //console.log ("X computed as " + item.rect.x);
     return item;