Merge pull request #1767 from dpalou/MOBILE-2861
MOBILE-2861 core: Fix error when dismissing a loading modal twicemain
commit
ef4d35e9dd
|
@ -1160,8 +1160,21 @@ export class CoreDomUtilsProvider {
|
|||
}
|
||||
|
||||
const loader = this.loadingCtrl.create({
|
||||
content: text
|
||||
});
|
||||
content: text
|
||||
}),
|
||||
dismiss = loader.dismiss.bind(loader);
|
||||
let isDismissed = false;
|
||||
|
||||
// Override dismiss to prevent dismissing a modal twice (it can throw an error and cause problems).
|
||||
loader.dismiss = (data, role, navOptions): Promise<any> => {
|
||||
if (isDismissed) {
|
||||
return Promise.resolve();
|
||||
}
|
||||
|
||||
isDismissed = true;
|
||||
|
||||
return dismiss(data, role, navOptions);
|
||||
};
|
||||
|
||||
loader.present();
|
||||
|
||||
|
|
Loading…
Reference in New Issue