Skip to content

Commit c92e099

Browse files
committed
Demo site: controllers definition changed to module .controller() approach; angular updated to 1.3.0-beta.17
Closes #51
1 parent bb10117 commit c92e099

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

example/app.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
2525

2626
.segment('s1', {
2727
templateUrl: 'templates/section1.html',
28-
controller: MainCtrl})
28+
controller: 'MainCtrl'})
2929

3030
.within()
3131

@@ -35,7 +35,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
3535

3636
.segment('itemInfo', {
3737
templateUrl: 'templates/section1/item.html',
38-
controller: Section1ItemCtrl,
38+
controller: 'Section1ItemCtrl',
3939
dependencies: ['id']})
4040

4141
.within()
@@ -56,7 +56,7 @@ app.config(function($routeSegmentProvider, $routeProvider) {
5656

5757
.segment('s2', {
5858
templateUrl: 'templates/section2.html',
59-
controller: MainCtrl})
59+
controller: 'MainCtrl'})
6060

6161
.within()
6262

@@ -177,43 +177,43 @@ app.config(function($routeSegmentProvider, $routeProvider) {
177177

178178
app.value('loader', {show: false});
179179

180-
function MainCtrl($scope, $routeSegment, loader) {
180+
app.controller('MainCtrl', function($scope, $routeSegment, loader) {
181181

182182
$scope.$routeSegment = $routeSegment;
183183
$scope.loader = loader;
184184

185185
$scope.$on('routeSegmentChange', function() {
186186
loader.show = false;
187187
})
188-
}
188+
});
189189

190-
function Section1Ctrl($scope, $routeSegment) {
190+
app.controller('Section1Ctrl', function($scope, $routeSegment) {
191191

192192
$scope.$routeSegment = $routeSegment;
193193
$scope.test = { btnClicked: false };
194194
$scope.items = [ 1,2,3,4,5 ];
195-
}
195+
});
196196

197-
function Section1ItemCtrl($scope, $routeSegment) {
197+
app.controller('Section1ItemCtrl', function($scope, $routeSegment) {
198198

199199
$scope.$routeSegment = $routeSegment;
200200
$scope.item = { id: $routeSegment.$routeParams.id };
201201
$scope.test = { textValue: '' };
202-
}
202+
});
203203

204-
function Section2Ctrl($scope, $routeSegment) {
204+
app.controller('Section2Ctrl', function($scope, $routeSegment) {
205205

206206
$scope.$routeSegment = $routeSegment;
207207
$scope.test = { textValue: '' };
208208
$scope.items = [ 1,2,3,4,5,6,7,8,9 ];
209-
}
209+
});
210210

211-
function ErrorCtrl($scope, error) {
211+
app.controller('ErrorCtrl', function($scope, error) {
212212
$scope.error = error;
213-
}
213+
});
214214

215-
function SlowDataCtrl($scope, data, loader) {
215+
app.controller('SlowDataCtrl', function($scope, data, loader) {
216216
loader.show = false;
217217
$scope.data = data;
218-
}
218+
});
219219

example/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
</div>
4040

4141

42-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
43-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-route.js"></script>
44-
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular-animate.js"></script>
42+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular.js"></script>
43+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular-route.js"></script>
44+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular-animate.js"></script>
4545
<script src="../build/angular-route-segment.min.js"></script>
4646
<script src="app.js"></script>
4747

0 commit comments

Comments
 (0)