diff --git a/angular/src/directives/proxies.ts b/angular/src/directives/proxies.ts index 3a8d013b71..78d3653be9 100644 --- a/angular/src/directives/proxies.ts +++ b/angular/src/directives/proxies.ts @@ -748,7 +748,7 @@ export class MenuButton { */ @NgInput() menu: string; /** - * Automatically hides the content when the corresponding menu is not active + * Automatically hides the menu button when the corresponding menu is not active */ @NgInput() autoHide: boolean; constructor(el: ElementRef) { diff --git a/angular/test/nav/package-lock.json b/angular/test/nav/package-lock.json index f879f2dc2c..35f22b6416 100644 --- a/angular/test/nav/package-lock.json +++ b/angular/test/nav/package-lock.json @@ -231,9 +231,9 @@ "integrity": "sha512-6HkJ+IZAy1o+EKjw1hBn+/CzkhHolCMXnUBxjHBCdNduCkeAiijFVCmok5lYbTjCX0xNI/rBtJmkFKrotBmWLQ==" }, "@ionic/core": { - "version": "0.1.5-2", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.1.5-2.tgz", - "integrity": "sha512-EnFzeFuW21rSd5RlpohMU+S6a4V1Tqe+ts1fFIMu708yBb0e6EXnd8LvU2nxel3f5W/t66aE8rAqhIpl2P0oMw==", + "version": "0.1.5-4", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.1.5-4.tgz", + "integrity": "sha512-dXaxgiWtiZc8pQzu/ia05OAqyr6QVwZFxOyKVhW/kIlzsTFfvNaxaPLnjG05YHqVYnRAhLd8ll00fgBYf95vWg==", "requires": { "ionicons": "4.0.0-18" } diff --git a/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts b/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts deleted file mode 100755 index d55a83a61d..0000000000 --- a/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { IonicModule } from '@ionic/angular'; -import { CamaroPage } from './camaro.page'; - -const routes: Routes = [ - { path: '', component: CamaroPage, outlet: 'tab2' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes), IonicModule], - exports: [RouterModule, IonicModule] -}) -export class CamaroPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts b/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts index 816acd5f20..4666a2b158 100755 --- a/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts +++ b/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts @@ -3,14 +3,12 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { CamaroPage } from './camaro.page'; -import { CamaroPageRoutingModule } from './camaro-routing.module'; @NgModule({ imports: [ CommonModule, - IonicModule, - CamaroPageRoutingModule + IonicModule ], declarations: [ CamaroPage diff --git a/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts b/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts deleted file mode 100755 index c240416c23..0000000000 --- a/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { IonicModule } from '@ionic/angular'; -import { ChargerPage } from './charger.page'; - -const routes: Routes = [ - { path: '', component: ChargerPage, outlet: 'tab3' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes), IonicModule], - exports: [RouterModule, IonicModule] -}) -export class ChargerPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts b/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts index 3eae27fc0e..d33856f844 100755 --- a/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts +++ b/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts @@ -3,14 +3,12 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { ChargerPage } from './charger.page'; -import { ChargerPageRoutingModule } from './charger-routing.module'; @NgModule({ imports: [ CommonModule, - IonicModule, - ChargerPageRoutingModule + IonicModule ], declarations: [ ChargerPage diff --git a/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts b/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts deleted file mode 100755 index 3d6871b803..0000000000 --- a/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { IonicModule } from '@ionic/angular'; -import { MustangPage } from './mustang.page'; - -const routes: Routes = [ - { path: '', component: MustangPage, outlet: 'tab1' } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes), IonicModule], - exports: [RouterModule, IonicModule] -}) -export class MustangPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts b/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts old mode 100755 new mode 100644 index 59c2a929f4..8731294a98 --- a/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts +++ b/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts @@ -3,14 +3,12 @@ import { CommonModule } from '@angular/common'; import { IonicModule } from '@ionic/angular'; import { MustangPage } from './mustang.page'; -import { MustangPageRoutingModule } from './mustang-routing.module'; @NgModule({ imports: [ CommonModule, - IonicModule, - MustangPageRoutingModule + IonicModule ], declarations: [ MustangPage diff --git a/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts b/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts index 2c610a231e..63515f2d12 100755 --- a/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts +++ b/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts @@ -4,6 +4,10 @@ import { Routes, RouterModule } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TabsPageComponent } from './tabs.component'; +import { CamaroPage } from './camaro/camaro.page'; +import { MustangPage } from './mustang/mustang.page'; +import { ChargerPage } from './charger/charger.page'; + const routes: Routes = [ { path: 'tabs', @@ -12,17 +16,17 @@ const routes: Routes = [ { path: 'mustang', outlet: 'tab1', - loadChildren: 'app/simple-tabs/mustang/mustang.module#MustangModule' + component: MustangPage }, { path: 'camaro', outlet: 'tab2', - loadChildren: 'app/simple-tabs/camaro/camaro.module#CamaroModule' + component: CamaroPage }, { path: 'charger', outlet: 'tab3', - loadChildren: 'app/simple-tabs/charger/charger.module#ChargerModule' + component: ChargerPage } ] }, @@ -35,7 +39,13 @@ const routes: Routes = [ @NgModule({ imports: [ - RouterModule.forChild(routes) + RouterModule.forChild(routes), + IonicModule + ], + declarations: [ + MustangPage, + CamaroPage, + ChargerPage ], exports: [ RouterModule