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

MOBILE-3947 chore: Fix Ionic package name conflicts

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2023-11-10 15:38:25 +01:00
parent e8dd8be967
commit c773a4d426
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/components/tabs-outlet/tabs-outlet.ts
View File

@ -28,7 +28,7 @@ import { Subscription } from 'rxjs';
import { CoreUtils } from '@services/utils/utils'; import { CoreUtils } from '@services/utils/utils';
import { Params } from '@angular/router'; import { Params } from '@angular/router';
import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons'; import { CoreNavBarButtonsComponent } from '../navbar-buttons/navbar-buttons';
import { StackEvent } from '@ionic/angular/directives/navigation/stack-utils'; import { StackDidChangeEvent } from '@ionic/angular/common/directives/navigation/stack-utils';
import { CoreNavigator } from '@services/navigator'; import { CoreNavigator } from '@services/navigator';
import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs'; import { CoreTabBase, CoreTabsBaseComponent } from '@classes/tabs';
import { CoreDirectivesRegistry } from '@singletons/directives-registry'; import { CoreDirectivesRegistry } from '@singletons/directives-registry';
@ -90,7 +90,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
return; return;
} }
this.stackEventsSubscription = this.ionTabs.outlet.stackEvents.subscribe(async (stackEvent: StackEvent) => { this.stackEventsSubscription = this.ionTabs.outlet.stackDidChange.subscribe(async (stackEvent: StackDidChangeEvent) => {
if (!this.isCurrentView) { if (!this.isCurrentView) {
return; return;
} }

6
src/core/services/navigator.ts
View File

@ -15,7 +15,7 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Params } from '@angular/router'; import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Params } from '@angular/router';
import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; import { NavigationOptions } from '@ionic/angular/common/providers/nav-controller';
import { CoreConstants } from '@/core/constants'; import { CoreConstants } from '@/core/constants';
import { CoreDomUtils } from '@services/utils/dom'; import { CoreDomUtils } from '@services/utils/dom';
@ -437,8 +437,8 @@ export class CoreNavigatorService {
* *
* @returns Promise resolved when done. * @returns Promise resolved when done.
*/ */
back(): Promise<void> { async back(): Promise<void> {
return NavController.pop(); await NavController.pop();
} }
/** /**

2
src/types/angular.d.ts vendored
View File

@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
import { UrlTree } from '@angular/router'; import { UrlTree } from '@angular/router';
import { NavigationOptions } from '@ionic/angular/providers/nav-controller'; import { NavigationOptions } from '@ionic/angular/common/providers/nav-controller';
declare module '@ionic/angular' { declare module '@ionic/angular' {