javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8260 from vanackere/fix-viewcontroller-dismiss

Browse Source 
Fix infinite loop (hang) in viewcontroller dismiss
This commit is contained in:
Manu Mtz.-Almeida
2016-10-12 21:50:01 +02:00
committed by GitHub
parent a2ffa63fd1 9227310494
commit ca3b9455d1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/navigation/view-controller.ts
View File

@ -1,7 +1,7 @@
import { ComponentRef, ElementRef, EventEmitter, Output, Renderer } from '@angular/core';
import { Footer, Header } from '../components/toolbar/toolbar';
import { isPresent, merge } from '../util/util';
import { isPresent, assign } from '../util/util';
import { Navbar } from '../components/navbar/navbar';
import { NavControllerBase } from './nav-controller-base';
import { NavOptions, ViewState } from './nav-util';
@ -184,7 +184,7 @@ export class ViewController {
return Promise.resolve(false);
}
let options = merge({}, this._leavingOpts, navOptions);
let options = assign({}, this._leavingOpts, navOptions);
this._onWillDismiss && this._onWillDismiss(data, role);
return this._nav.remove(this._nav.indexOf(this), 1, options).then(() => {
this._onDidDismiss && this._onDidDismiss(data, role);