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(nav): ionViewCanLeave does not break navigation

Browse Source 
fixes #8408
This commit is contained in:
Manu Mtz.-Almeida
2016-10-04 23:28:59 +02:00
parent e8e518a863
commit c8954d8a16
6 changed files with 230 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/mock-providers.ts
View File

@@ -10,14 +10,13 @@ import { Form } from './form';
import { GestureController } from '../gestures/gesture-controller';
import { Keyboard } from './keyboard';
import { Menu } from '../components/menu/menu';
import { NavOptions, ViewState, DeepLinkConfig } from '../navigation/nav-util';
import { ViewState, DeepLinkConfig } from '../navigation/nav-util';
import { OverlayPortal } from '../components/nav/overlay-portal';
import { PageTransition } from '../transitions/page-transition';
import { Platform } from '../platform/platform';
import { QueryParams } from '../platform/query-params';
import { Tab } from '../components/tabs/tab';
import { Tabs } from '../components/tabs/tabs';
import { Transition } from '../transitions/transition';
import { TransitionController } from '../transitions/transition-controller';
import { UrlSerializer } from '../navigation/url-serializer';
import { ViewController } from '../navigation/view-controller';
@@ -271,7 +270,7 @@ export const mockNavController = function(): NavControllerBase {
linker
);
nav._viewInit = function(trns: Transition, enteringView: ViewController, opts: NavOptions) {
nav._viewInit = function(enteringView: ViewController) {
enteringView.init(mockComponentRef());
enteringView._state = ViewState.INITIALIZED;
};