Skip to content

Commit bb0b8da

Browse files
artchartch
committed
Demo example is changed regarding new features - filters, getSegmentUrl, default option
1 parent 2eee0a1 commit bb0b8da

File tree

4 files changed

+35
-26
lines changed

4 files changed

+35
-26
lines changed

‎example/app.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ app.config(function($routeSegmentProvider, $routeProvider) {
1212

1313
$routeSegmentProvider
1414

15-
.when('/section1', 's1.home')
15+
.when('/section1', 's1')
1616
.when('/section1/prefs', 's1.prefs')
17-
.when('/section1/:id', 's1.itemInfo.tab1')
17+
.when('/section1/:id', 's1.itemInfo')
1818
.when('/section1/:id/X', 's1.itemInfo.tab1')
1919
.when('/section1/:id/Y', 's1.itemInfo.tab2')
2020

@@ -30,6 +30,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
3030
.within()
3131

3232
.segment('home', {
33+
default: true,
3334
templateUrl: 'templates/section1/home.html'})
3435

3536
.segment('itemInfo', {
@@ -40,6 +41,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
4041
.within()
4142

4243
.segment('tab1', {
44+
default: true,
4345
templateUrl: 'templates/section1/tabs/tab1.html'})
4446

4547
.segment('tab2', {
@@ -89,7 +91,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
8991
.when('/invalid-data', 's1.invalidData')
9092
.when('/slow-data', 's1.slowDataSimple')
9193
.when('/slow-data-loading', 's1.slowDataLoading')
92-
.when('/inline-view', 's1.inlineParent.inlineChildren')
94+
.when('/inline-view', 's1.inlineParent')
9395
.when('/section1/:id/slow', 's1.itemInfo.tabSlow')
9496

9597
.within('s1')
@@ -141,6 +143,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
141143
.segment('inlineChildren', {
142144
// no template here
143145
controller: 'SlowDataCtrl',
146+
default: true,
144147
resolve: {
145148
data: function($timeout) {
146149
return $timeout(function() { return 'SLOW DATA CONTENT'; }, 2000);

‎example/index.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="utf-8">
55
<title>Route Segment Demo</title>
66
<link rel="stylesheet" href="css/bootstrap.min.css">
7-
<link rel="stylesheet" href="css/app.css">
7+
<link rel="stylesheet" href="css/app.css">
88
</head>
99
<body>
1010

@@ -16,9 +16,15 @@
1616
<div class="pull-right label">Current route: <span ng-bind="$routeSegment.name"></span></div>
1717
<a class="brand" href="http://angular-route-segment.com">angular-route-segment</a>
1818
<ul class="nav">
19-
<li ng-class="{active: $routeSegment.startsWith('s1')}"><a href="#/section1">Section 1</a></li>
20-
<li ng-class="{active: $routeSegment.startsWith('s2')}"><a href="#/section2">Section 2</a></li>
21-
<li ng-class="{active: $routeSegment.startsWith('s3')}"><a href="#/section3">Section 3</a></li>
19+
<li ng-class="{active: ('s1' | routeSegmentStartsWith)}">
20+
<a href="#{{'s1' | routeSegmentUrl}}">Section 1</a>
21+
</li>
22+
<li ng-class="{active: ('s2' | routeSegmentStartsWith)}">
23+
<a href="#{{'s2' | routeSegmentUrl}}">Section 2</a>
24+
</li>
25+
<li ng-class="{active: ('s3' | routeSegmentStartsWith)}">
26+
<a href="#{{'s3' | routeSegmentUrl}}">Section 3</a>
27+
</li>
2228
</ul>
2329
</div>
2430
</div>

‎example/templates/section1.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,43 @@
33
<div class="well">
44
<ul class="nav nav-list">
55

6-
<li ng-class="{active: $routeSegment.name == 's1.home'}"><a href="#/section1/">Home</a></li>
6+
<li ng-class="{active: ('s1.home' | routeSegmentStartsWith)}">
7+
<a href="#{{ 's1' | routeSegmentUrl }}">Home</a>
8+
</li>
79

810
<li class="nav-header">Items</li>
911

1012
<li ng-repeat="i in items"
11-
ng-class="{active: $routeSegment.startsWith('s1.itemInfo') && $routeSegment.$routeParams.id == i}">
12-
13-
<a ng-href="#/section1/{{i}}">Item {{i}}</a>
14-
13+
ng-class="{active: ('s1.itemInfo' | routeSegmentStartsWith) && ('id' | routeSegmentParam) == i}">
14+
<a ng-href="#{{ 's1.itemInfo' | routeSegmentUrl: {id: i} }}">Item {{i}}</a>
1515
</li>
1616

17-
<li ng-class="{active: $routeSegment.startsWith('s1.prefs')}">
18-
<a href="#/section1/prefs">Preferences</a>
17+
<li ng-class="{active: ('s1.prefs' | routeSegmentStartsWith)}">
18+
<a href="#{{ 's1.prefs' | routeSegmentUrl }}">Preferences</a>
1919
</li>
2020

2121
<li class="nav-header">Error handling</li>
2222

23-
<li ng-class="{active: $routeSegment.startsWith('s1.invalidTemplate')}">
24-
<a href="#/invalid-template">Invalid template file</a>
23+
<li ng-class="{active: ('s1.invalidTemplate' | routeSegmentStartsWith)}">
24+
<a href="#{{ 's1.invalidTemplate' | routeSegmentUrl }}">Invalid template file</a>
2525
</li>
2626

27-
<li ng-class="{active: $routeSegment.startsWith('s1.invalidData')}">
28-
<a href="#/invalid-data">Invalid resolve data</a>
27+
<li ng-class="{active: ('s1.invalidData' | routeSegmentStartsWith)}">
28+
<a href="#{{ 's1.invalidData' | routeSegmentUrl }}">Invalid resolve data</a>
2929
</li>
3030

3131
<li class="nav-header">Slow data resolving</li>
3232

33-
<li ng-class="{active: $routeSegment.startsWith('s1.slowDataSimple')}">
34-
<a href="#/slow-data">Without `untilResolved`</a>
33+
<li ng-class="{active: ('s1.slowDataSimple' | routeSegmentStartsWith)}">
34+
<a href="#{{ 's1.slowDataSimple' | routeSegmentUrl }}">Without `untilResolved`</a>
3535
</li>
3636

37-
<li ng-class="{active: $routeSegment.startsWith('s1.slowDataLoading')}">
38-
<a href="#/slow-data-loading">With `untilResolved`</a>
37+
<li ng-class="{active: ('s1.slowDataLoading' | routeSegmentStartsWith)}">
38+
<a href="#{{ 's1.slowDataLoading' | routeSegmentUrl }}">With `untilResolved`</a>
3939
</li>
4040

41-
<li ng-class="{active: $routeSegment.startsWith('s1.inlineView')}">
42-
<a href="#/inline-view">Inline view</a>
41+
<li ng-class="{active: ('s1.inlineParent' | routeSegmentStartsWith)}">
42+
<a href="#{{ 's1.inlineParent' | routeSegmentUrl }}">Inline view</a>
4343
</li>
4444

4545
<li class="divider"></li>

‎example/templates/section2.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ <h2>Section 2</h2>
88
<ul class="nav nav-pills">
99

1010
<li ng-repeat="i in items"
11-
ng-class="{active: $routeSegment.$routeParams.id==i}">
11+
ng-class="{active: ('id' | routeSegmentParam) == i}">
1212

13-
<a ng-href="#/section2/{{i}}">Item {{i}}</a>
13+
<a ng-href="#{{ 's2.itemInfo' | routeSegmentUrl: {id: i} }}">Item {{i}}</a>
1414

1515
</li>
1616
</ul>

0 commit comments

Comments
 (0)