From 19c26c350efb1b008ee9806fbf73d64cfba864f5 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 11 Oct 2016 16:14:33 -0400 Subject: removed my math.ceil hack, added PR hack Former-commit-id: f142c72ea69ca11eae8d3a37ec933754e833eabe --- www/external/ion-pullup.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/external') diff --git a/www/external/ion-pullup.js b/www/external/ion-pullup.js index 9bd5ab56..798d25ee 100755 --- a/www/external/ion-pullup.js +++ b/www/external/ion-pullup.js @@ -43,8 +43,8 @@ angular.module('ionic-pullup', []) tabs = document.querySelector('.tabs'); hasBottomTabs = document.querySelector('.tabs-bottom'); header = document.querySelector('.bar-header'); - tabsHeight = tabs ? tabs.offsetHeight : 0; - headerHeight = header ? header.offsetHeight : 0; + tabsHeight = tabs ? tabs.offsetHeight : 80; + headerHeight = header ? header.offsetHeight : 80; } function computeHeights() { -- cgit v1.2.3 From 0202d7298986ab02cb1571751d7261ab8afc5f42 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 11 Oct 2016 16:15:06 -0400 Subject: removed my ceil hack, added PR hack for round Former-commit-id: f470f17b8c96ea755d2551d925209e448506a70b --- www/external/packery.pkgd.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'www/external') 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; -- cgit v1.2.3 From 9d22cfa117ea0e50ffaef4330d899c27aa59349f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 12 Oct 2016 10:44:46 -0400 Subject: adjusted heights for android and ios Former-commit-id: 4e0b91761388501c5fb88c332712f6917d827961 --- www/external/ion-pullup.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'www/external') diff --git a/www/external/ion-pullup.js b/www/external/ion-pullup.js index 798d25ee..ae9109a8 100755 --- a/www/external/ion-pullup.js +++ b/www/external/ion-pullup.js @@ -43,12 +43,20 @@ angular.module('ionic-pullup', []) tabs = document.querySelector('.tabs'); hasBottomTabs = document.querySelector('.tabs-bottom'); header = document.querySelector('.bar-header'); - tabsHeight = tabs ? tabs.offsetHeight : 80; - headerHeight = header ? header.offsetHeight : 80; + 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() { -- cgit v1.2.3