diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-12 10:44:46 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-10-12 10:44:46 -0400 |
| commit | 9d22cfa117ea0e50ffaef4330d899c27aa59349f (patch) | |
| tree | af1a177be4783cc5d4704d994903c426425718d6 /www | |
| parent | 7cb5b070f032b5de9f017f2f074a14f90da75c45 (diff) | |
adjusted heights for android and ios
Former-commit-id: 4e0b91761388501c5fb88c332712f6917d827961
Diffstat (limited to 'www')
| -rwxr-xr-x | www/external/ion-pullup.js | 14 |
1 files changed, 12 insertions, 2 deletions
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() { |