diff --git a/demos/native/index.ts b/demos/native/index.ts index da9c1207c3..69f97032f4 100644 --- a/demos/native/index.ts +++ b/demos/native/index.ts @@ -74,6 +74,6 @@ class MyApp { menu.close(); let nav = this.app.getComponent('myNav'); - nav.setViews([page.page]); + nav.setRoot(page.page); } } diff --git a/demos/native/main.html b/demos/native/main.html index 905616c134..1882213767 100644 --- a/demos/native/main.html +++ b/demos/native/main.html @@ -2,9 +2,9 @@ Plugins - - {{p.title}} - + diff --git a/ionic/components/menu/menu.ts b/ionic/components/menu/menu.ts index c2ab5a3a1e..02c4cdfd87 100644 --- a/ionic/components/menu/menu.ts +++ b/ionic/components/menu/menu.ts @@ -136,14 +136,12 @@ export class Menu extends Ion { setProgess(value) { // user actively dragging the menu this._disable(); - this.app.setEnabled(false, 4000); this._type.setProgess(value); } setProgressEnd(shouldComplete) { // user has finished dragging the menu this._disable(); - this.app.setEnabled(false); this._type.setProgressEnd(shouldComplete).then(isOpen => { this._after(isOpen); }); @@ -156,16 +154,12 @@ export class Menu extends Ion { this.getBackdropElement().classList.add('show-backdrop'); this._disable(); - this.app.setEnabled(false); } _after(isOpen) { // keep opening/closing the menu disabled for a touch more yet this._disable(); - // but the app itself can be used again - this.app.setEnabled(true); - this.isOpen = isOpen; this._cntEle.classList[isOpen ? 'add' : 'remove']('menu-content-open'); @@ -183,7 +177,7 @@ export class Menu extends Ion { _disable() { // used to prevent unwanted opening/closing after swiping open/close // or swiping open the menu while pressing down on the menu-toggle - this._disableTime = Date.now() + 300; + this._disableTime = Date.now() + 20; } _isDisabled() {