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(refresher): adjust location after layout updates

Browse Source
This commit is contained in:
Adam Bradley
2016-06-21 12:46:49 -05:00
parent 22fad4c4a3
commit 603000fa72
4 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,8 +64,6 @@ export class Content extends Ion {
private _paddingRight: number;
private _paddingBottom: number;
private _paddingLeft: number;
private _lastTop: number;
private _lastBottom: number;
private _scrollPadding: number;
private _headerHeight: number;
private _footerHeight: number;
@ -78,6 +76,16 @@ export class Content extends Ion {
private _sbPadding: boolean;
private _fullscreen: boolean;
/**
* @private
*/
adjustedTop: number;
/**
* @private
*/
adjustedBottom: number;
constructor(
private _elementRef: ElementRef,
private _config: Config,
@ -185,7 +193,7 @@ export class Content extends Ion {
}
};
}
/**
* @private
*/
@ -510,16 +518,18 @@ export class Content extends Ion {
if (this._tabbarPlacement === 'top') {
newVal += this._tabbarHeight;
}
if (newVal !== this._lastTop) {
if (newVal !== this.adjustedTop) {
this._scrollEle.style.paddingTop = (newVal > 0 ? newVal + 'px' : '');
this.adjustedTop = newVal;
}
newVal = this._footerHeight + this._paddingBottom;
if (this._tabbarPlacement === 'bottom') {
newVal += this._tabbarHeight;
}
if (newVal !== this._lastBottom) {
if (newVal !== this.adjustedBottom) {
this._scrollEle.style.paddingBottom = (newVal > 0 ? newVal + 'px' : '');
this.adjustedBottom = newVal;
}
} else {
@ -528,16 +538,18 @@ export class Content extends Ion {
if (this._tabbarPlacement === 'top') {
newVal += this._tabbarHeight;
}
if (newVal !== this._lastTop) {
if (newVal !== this.adjustedTop) {
this._scrollEle.style.marginTop = (newVal > 0 ? newVal + 'px' : '');
this.adjustedTop = newVal;
}
newVal = this._footerHeight;
if (this._tabbarPlacement === 'bottom') {
newVal += this._tabbarHeight;
}
if (newVal !== this._lastBottom) {
if (newVal !== this.adjustedBottom) {
this._scrollEle.style.marginBottom = (newVal > 0 ? newVal + 'px' : '');
this.adjustedBottom = newVal;
}
}