Skip to content

Commit

Permalink
Merge pull request #10119 from manucorporat/fix-regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed Jan 23, 2017
2 parents 3282c95 + 23a70e1 commit 2ee05b8
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 27 deletions.
4 changes: 3 additions & 1 deletion src/components/alert/alert-component.ts
Expand Up @@ -259,7 +259,9 @@ export class AlertCmp {
}

if (shouldDismiss) {
this.dismiss(button.role);
this.dismiss(button.role).catch(() => {
console.debug('alert can not be dismissed');
});
}
}

Expand Down
42 changes: 19 additions & 23 deletions src/components/item/item-sliding.ts
Expand Up @@ -315,12 +315,7 @@ export class ItemSliding {
openAmount = optsWidth + (openAmount - optsWidth) * ELASTIC_FACTOR;
}

// this.debouncer.write(() => {

// });
this._dom.write(() => {
this._setOpenAmount(openAmount, false);
});
this._setOpenAmount(openAmount, false);

return openAmount;
}
Expand Down Expand Up @@ -362,29 +357,30 @@ export class ItemSliding {
* @private
*/
private calculateOptsWidth() {
this._plt.raf(() => {
if (!this._optsDirty) {
return;
}
this._optsWidthRightSide = 0;
if (this._rightOptions) {
this._optsWidthRightSide = this._rightOptions.width();
assert(this._optsWidthRightSide > 0, '_optsWidthRightSide should not be zero');
}
if (!this._optsDirty) {
return;
}
this._optsWidthRightSide = 0;
if (this._rightOptions) {
this._optsWidthRightSide = this._rightOptions.width();
assert(this._optsWidthRightSide > 0, '_optsWidthRightSide should not be zero');
}

this._optsWidthLeftSide = 0;
if (this._leftOptions) {
this._optsWidthLeftSide = this._leftOptions.width();
assert(this._optsWidthLeftSide > 0, '_optsWidthLeftSide should not be zero');
}
this._optsDirty = false;
});
this._optsWidthLeftSide = 0;
if (this._leftOptions) {
this._optsWidthLeftSide = this._leftOptions.width();
assert(this._optsWidthLeftSide > 0, '_optsWidthLeftSide should not be zero');
}
this._optsDirty = false;
}

private _setOpenAmount(openAmount: number, isFinal: boolean) {
const platform = this._plt;

platform.cancelTimeout(this._tmr);
if (this._tmr) {
platform.cancelTimeout(this._tmr);
this._tmr = null;
}
this._openAmount = openAmount;

if (isFinal) {
Expand Down
4 changes: 3 additions & 1 deletion src/components/nav/nav-pop.ts
Expand Up @@ -43,7 +43,9 @@ export class NavPop {
onClick(): boolean {
// If no target, or if target is _self, prevent default browser behavior
if (this._nav) {
this._nav.pop(null, null);
this._nav.pop().catch(() => {
console.debug('navPop was rejected');
});
return false;
}

Expand Down
4 changes: 3 additions & 1 deletion src/components/nav/nav-push.ts
Expand Up @@ -72,7 +72,9 @@ export class NavPush {
@HostListener('click')
onClick(): boolean {
if (this._nav && this.navPush) {
this._nav.push(this.navPush, this.navParams, null);
this._nav.push(this.navPush, this.navParams).catch(() => {
console.debug('navPush was rejected');
});
return false;
}
return true;
Expand Down
1 change: 1 addition & 0 deletions src/components/tabs/test/advanced/app.module.ts
Expand Up @@ -81,6 +81,7 @@ export class TabsPage {
alert.dismiss().then(() => {
resolve();
});
return false;
}
}
]
Expand Down
4 changes: 3 additions & 1 deletion src/gestures/drag-gesture.ts
Expand Up @@ -110,7 +110,9 @@ export class PanGesture {
pointerMove(ev: any) {
assert(this.started === true, 'started must be true');
if (this.captured) {
this.onDragMove(ev);
this.debouncer.write(() => {
this.onDragMove(ev);
});
return;
}

Expand Down

0 comments on commit 2ee05b8

Please sign in to comment.