mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
@@ -74,6 +74,6 @@ class MyApp {
|
||||
menu.close();
|
||||
|
||||
let nav = this.app.getComponent('myNav');
|
||||
nav.setViews([page.page]);
|
||||
nav.setRoot(page.page);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
<ion-toolbar><ion-title>Plugins</ion-title></ion-toolbar>
|
||||
<ion-content>
|
||||
<ion-list>
|
||||
<ion-item *ng-for="#p of plugins" (click)="openPage(menu, p)">
|
||||
<span>{{p.title}}</span>
|
||||
</ion-item>
|
||||
<button ion-item *ng-for="#p of plugins" (click)="openPage(menu, p)">
|
||||
{{p.title}}
|
||||
</button>
|
||||
</ion-list>
|
||||
</ion-content>
|
||||
</ion-menu>
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user