javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 05:21:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(footer): show footer toolbar w/ tabbar bottom

Browse Source
This commit is contained in:
Adam Bradley
2016-06-22 16:00:39 -05:00
parent f7880c9d5f
commit 99c50a151f
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/content/content.ts
View File

@ -72,9 +72,10 @@ export class Content extends Ion {
private _inputPolling: boolean = false; private _inputPolling: boolean = false;
private _scroll: ScrollView; private _scroll: ScrollView;
private _scLsn: Function; private _scLsn: Function;
private _scrollEle: HTMLElement;
private _sbPadding: boolean; private _sbPadding: boolean;
private _fullscreen: boolean; private _fullscreen: boolean;
private _scrollEle: HTMLElement;
private _footerEle: HTMLElement;
/** /**
* @private * @private
@ -128,7 +129,7 @@ export class Content extends Ion {
ngOnDestroy() { ngOnDestroy() {
this._scLsn && this._scLsn(); this._scLsn && this._scLsn();
this._scroll && this._scroll.destroy(); this._scroll && this._scroll.destroy();
this._scrollEle = this._scLsn = null; this._scrollEle = this._footerEle = this._scLsn = null;
} }
/** /**
@ -478,6 +479,7 @@ export class Content extends Ion {
} else if (ele.tagName === 'ION-FOOTER') { } else if (ele.tagName === 'ION-FOOTER') {
this._footerHeight = ele.clientHeight; this._footerHeight = ele.clientHeight;
this._footerEle = ele;
} }
} }
@ -506,6 +508,7 @@ export class Content extends Ion {
*/ */
writeDimensions() { writeDimensions() {
let newVal: number; let newVal: number;
let scrollEle = this._scrollEle;
// only write when it has changed // only write when it has changed
if (this._fullscreen) { if (this._fullscreen) {
@ -519,7 +522,7 @@ export class Content extends Ion {
newVal += this._tabbarHeight; newVal += this._tabbarHeight;
} }
if (newVal !== this.adjustedTop) { if (newVal !== this.adjustedTop) {
this._scrollEle.style.paddingTop = (newVal > 0 ? newVal + 'px' : ''); scrollEle.style.paddingTop = (newVal > 0 ? newVal + 'px' : '');
this.adjustedTop = newVal; this.adjustedTop = newVal;
} }
@ -528,8 +531,12 @@ export class Content extends Ion {
newVal += this._tabbarHeight; newVal += this._tabbarHeight;
} }
if (newVal !== this.adjustedBottom) { if (newVal !== this.adjustedBottom) {
this._scrollEle.style.paddingBottom = (newVal > 0 ? newVal + 'px' : ''); scrollEle.style.paddingBottom = (newVal > 0 ? newVal + 'px' : '');
this.adjustedBottom = newVal; this.adjustedBottom = newVal;
if (newVal > 0 && this._footerEle) {
this._footerEle.style.bottom = (newVal - this._footerHeight) + 'px';
}
} }
} else { } else {
@ -539,7 +546,7 @@ export class Content extends Ion {
newVal += this._tabbarHeight; newVal += this._tabbarHeight;
} }
if (newVal !== this.adjustedTop) { if (newVal !== this.adjustedTop) {
this._scrollEle.style.marginTop = (newVal > 0 ? newVal + 'px' : ''); scrollEle.style.marginTop = (newVal > 0 ? newVal + 'px' : '');
this.adjustedTop = newVal; this.adjustedTop = newVal;
} }
@ -548,8 +555,12 @@ export class Content extends Ion {
newVal += this._tabbarHeight; newVal += this._tabbarHeight;
} }
if (newVal !== this.adjustedBottom) { if (newVal !== this.adjustedBottom) {
this._scrollEle.style.marginBottom = (newVal > 0 ? newVal + 'px' : ''); scrollEle.style.marginBottom = (newVal > 0 ? newVal + 'px' : '');
this.adjustedBottom = newVal; this.adjustedBottom = newVal;
if (newVal > 0 && this._footerEle) {
this._footerEle.style.bottom = (newVal - this._footerHeight) + 'px';
}
} }
} }