javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(animation): always call onFinish()

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-09-14 23:37:50 +02:00
parent b8b9b83d49
commit c23c5a44cd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/components/menu-controller/menu-controller.ts
View File

@@ -182,8 +182,8 @@ export class MenuController implements MenuControllerI {
* Returns true if any menu is currently animating.
*/
@Method()
async isAnimating(): Promise<boolean> {
return this.menus.some(menu => menu.isAnimating);
isAnimating(): Promise<boolean> {
return Promise.resolve(this.isAnimatingSync());
}
@Method()
@@ -214,7 +214,7 @@ export class MenuController implements MenuControllerI {
@Method()
async _setOpen(menu: MenuI, shouldOpen: boolean, animated: boolean): Promise<boolean> {
if (await this.isAnimating()) {
if (this.isAnimatingSync()) {
return false;
}
if (shouldOpen) {
@@ -248,6 +248,10 @@ export class MenuController implements MenuControllerI {
return this.menus.map(menu => menu.el);
}
isAnimatingSync(): boolean {
return this.menus.some(menu => menu.isAnimating);
}
private registerAnimation(name: string, animation: AnimationBuilder) {
this.menuAnimations.set(name, animation);
}