GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-3320 tabs: Fix navigation

Browse Source
This commit is contained in:
Noel De Martin 2020-12-23 12:53:43 +01:00
parent 30b8c506e7
commit 3a117e49bf
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/components/tabs/tabs.ts
View File

@ -588,7 +588,7 @@ export class CoreTabsComponent implements OnInit, AfterViewInit, OnChanges, OnDe
}
const ok = await this.navCtrl.navigateForward(selectedTab.page, pageParams);
if (ok) {
if (ok !== false) {
this.selectHistory.push(tabId);
this.selected = tabId;
this.selectedIndex = index;

26
src/types/angular.d.ts vendored Normal file
View File

@ -0,0 +1,26 @@
// (C) Copyright 2015 Moodle Pty Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
import { UrlTree } from '@angular/router';
import { NavigationOptions } from '@ionic/angular/providers/nav-controller';
declare module '@ionic/angular' {
export class NavController {
navigateForward(url: string | UrlTree | any[], options?: NavigationOptions): Promise<boolean | null>;
}
}