Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/demo-app/demo-app-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {SidenavDemo} from './sidenav/sidenav-demo';
import {SnackBarDemo} from './snack-bar/snack-bar-demo';
import {PortalDemo, ScienceJoke} from './portal/portal-demo';
import {MenuDemo} from './menu/menu-demo';
import {TabsDemoModule} from './tabs/tabs-demo.module';
import {TabsDemo, SunnyTabContent, RainyTabContent, FoggyTabContent} from './tabs/tabs-demo';

@NgModule({
imports: [
Expand All @@ -41,7 +41,6 @@ import {TabsDemoModule} from './tabs/tabs-demo.module';
HttpModule,
RouterModule.forRoot(DEMO_APP_ROUTES),
MaterialModule.forRoot(),
TabsDemoModule,
],
declarations: [
BaselineDemo,
Expand Down Expand Up @@ -77,6 +76,10 @@ import {TabsDemoModule} from './tabs/tabs-demo.module';
SpagettiPanel,
ToolbarDemo,
TooltipDemo,
TabsDemo,
SunnyTabContent,
RainyTabContent,
FoggyTabContent,
],
entryComponents: [
DemoApp,
Expand Down
23 changes: 0 additions & 23 deletions src/demo-app/tabs/tabs-demo.module.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/demo-app/tabs/tabs-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export class TabsDemo {
// This is not an ideal check and can be removed if routerLink exposes if it is active.
// https://github.com/angular/angular/pull/12525
this.activeLinkIndex =
this.tabLinks.findIndex(routedTab => router.url.indexOf(routedTab.link) != -1);
this.tabLinks.indexOf(this.tabLinks.find(tab => router.url.indexOf(tab.link) != -1));
}
}

Expand Down