Skip to content

Commit d97176e

Browse files
committed
simplifying tabs/bottomNav samples
1 parent 8af7ee2 commit d97176e

File tree

4 files changed

+22
-40
lines changed

4 files changed

+22
-40
lines changed

src/app/layouts/tabbar/tabbar-sample-3/tabbar-sample-3.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<igx-select [value]="currentDocumentLocation" (onSelection)="handleSelection($event)">
22
<label igxLabel>URL</label>
3-
<igx-select-item *ngFor="let aLocation of urlLocations" [value]="aLocation.url">
4-
{{ aLocation.label }}
3+
<igx-select-item *ngFor="let aLocation of urlLocations" [value]="aLocation">
4+
{{ aLocation }}
55
</igx-select-item>
66
</igx-select>
77

src/app/layouts/tabbar/tabbar-sample-3/tabbar-sample-3.component.ts

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ import { ISelectionEventArgs } from "igniteui-angular";
88
templateUrl: "tabbar-sample-3.component.html"
99
})
1010
export class TabbarSample3Component implements OnInit {
11-
public urlLocations = [];
11+
public urlLocations = [
12+
"/layouts/tabbar-sample-3",
13+
"/layouts/tabbar-sample-3/view1",
14+
"/layouts/tabbar-sample-3/view2",
15+
"/layouts/tabbar-sample-3/view3"
16+
];
1217

1318
constructor(private router: Router) { }
1419

@@ -17,25 +22,11 @@ export class TabbarSample3Component implements OnInit {
1722
}
1823

1924
public ngOnInit() {
20-
const availableAddresses = [
21-
{ label: "/layouts/tabbar-sample-3", url: "/layouts/tabbar-sample-3" },
22-
{ label: "/layouts/tabbar-sample-3/view1", url: "/layouts/tabbar-sample-3/view1" },
23-
{ label: "/layouts/tabbar-sample-3/view2", url: "/layouts/tabbar-sample-3/view2" },
24-
{ label: "/layouts/tabbar-sample-3/view3", url: "/layouts/tabbar-sample-3/view3" }
25-
];
26-
2725
const currentAddress: string = document.location.href;
2826
if (currentAddress.indexOf("samples") !== -1) {
29-
availableAddresses.forEach(address => {
30-
this.urlLocations.push({
31-
label: "/samples" + address.label,
32-
url: "/samples" + address.url
33-
});
34-
});
35-
} else {
36-
availableAddresses.forEach(address => {
37-
this.urlLocations.push(address);
38-
});
27+
for (let i = 0; i < this.urlLocations.length; i++) {
28+
this.urlLocations[i] = "/samples" + this.urlLocations[i];
29+
}
3930
}
4031
}
4132

src/app/layouts/tabs/tabs-sample-6/tabs-sample-6.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<igx-select [value]="currentDocumentLocation" (onSelection)="handleSelection($event)">
22
<label igxLabel>URL</label>
3-
<igx-select-item *ngFor="let aLocation of urlLocations" [value]="aLocation.url">
4-
{{ aLocation.label }}
3+
<igx-select-item *ngFor="let aLocation of urlLocations" [value]="aLocation">
4+
{{ aLocation }}
55
</igx-select-item>
66
</igx-select>
77

src/app/layouts/tabs/tabs-sample-6/tabs-sample-6.component.ts

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ import { ISelectionEventArgs } from "igniteui-angular";
88
templateUrl: "./tabs-sample-6.component.html"
99
})
1010
export class TabsSample6Component implements OnInit {
11-
public urlLocations = [];
11+
public urlLocations = [
12+
"/layouts/tabs-sample-6",
13+
"/layouts/tabs-sample-6/view1",
14+
"/layouts/tabs-sample-6/view2",
15+
"/layouts/tabs-sample-6/view3"
16+
];
1217

1318
constructor(private router: Router) { }
1419

@@ -17,25 +22,11 @@ export class TabsSample6Component implements OnInit {
1722
}
1823

1924
public ngOnInit() {
20-
const availableAddresses = [
21-
{ label: "/layouts/tabs-sample-6", url: "/layouts/tabs-sample-6" },
22-
{ label: "/layouts/tabs-sample-6/view1", url: "/layouts/tabs-sample-6/view1" },
23-
{ label: "/layouts/tabs-sample-6/view2", url: "/layouts/tabs-sample-6/view2" },
24-
{ label: "/layouts/tabs-sample-6/view3", url: "/layouts/tabs-sample-6/view3" }
25-
];
26-
2725
const currentAddress: string = document.location.href;
2826
if (currentAddress.indexOf("samples") !== -1) {
29-
availableAddresses.forEach(address => {
30-
this.urlLocations.push({
31-
label: "/samples" + address.label,
32-
url: "/samples" + address.url
33-
});
34-
});
35-
} else {
36-
availableAddresses.forEach(address => {
37-
this.urlLocations.push(address);
38-
});
27+
for (let i = 0; i < this.urlLocations.length; i++) {
28+
this.urlLocations[i] = "/samples" + this.urlLocations[i];
29+
}
3930
}
4031
}
4132

0 commit comments

Comments
 (0)