Skip to content

Commit acc2722

Browse files
btfordbtford
committed
refactor(router): rename navigate and navigateInstruction methods
1 parent 5e49d7e commit acc2722

17 files changed

+126
-125
lines changed

‎modules/angular1_router/build.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function main() {
7878
"var router = new RootRouter(registry, undefined, location, new Object());",
7979
"$rootScope.$watch(function () { return $location.path(); }, function (path) {",
8080
"if (router.lastNavigationAttempt !== path) {",
81-
"router.navigate(path);",
81+
"router.navigateByUrl(path);",
8282
"}",
8383
"});",
8484

‎modules/angular1_router/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
angular.module('myApp', ['ngComponentRouter'])
1515
.controller('MyCtrl', ['$router', function ($router) {
1616
console.log($router);
17-
$router.navigate('/')
17+
$router.navigateByUrl('/')
1818
.then(console.log.bind(console, 'resolve'), console.log.bind(console, 'reject'));
1919
}]);
2020
</script>

‎modules/angular1_router/src/ng_outlet.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ function anchorLinkDirective($router) {
307307

308308
var href = element.attr(hrefAttrName);
309309
if (href && $router.recognize(href)) {
310-
$router.navigate(href);
310+
$router.navigateByUrl(href);
311311
event.preventDefault();
312312
}
313313
});

‎modules/angular1_router/test/component_mapper_spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('$componentMapper', function () {
6363
{ path: '/', component: Ctrl }
6464
]);
6565

66-
$router.navigate('/');
66+
$router.navigateByUrl('/');
6767
$rootScope.$digest();
6868

6969
expect(elt.text()).toBe('howdy');

‎modules/angular1_router/test/integration/lifecycle_hook_spec.js‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('ngOutlet', function () {
5151
]);
5252
compile('<div>outer { <div ng-outlet></div> }</div>');
5353

54-
$router.navigate('/a');
54+
$router.navigateByUrl('/a');
5555
$rootScope.$digest();
5656

5757
expect(spy).toHaveBeenCalled();
@@ -69,7 +69,7 @@ describe('ngOutlet', function () {
6969
]);
7070
compile('<div ng-outlet></div>');
7171

72-
$router.navigate('/user/brian');
72+
$router.navigateByUrl('/user/brian');
7373
$rootScope.$digest();
7474

7575
expect(spy).toHaveBeenCalledWith(instructionFor(UserController), undefined);
@@ -88,9 +88,9 @@ describe('ngOutlet', function () {
8888
]);
8989
compile('<div ng-outlet></div>');
9090

91-
$router.navigate('/user/brian');
91+
$router.navigateByUrl('/user/brian');
9292
$rootScope.$digest();
93-
$router.navigate('/post/123');
93+
$router.navigateByUrl('/post/123');
9494
$rootScope.$digest();
9595
expect(spy).toHaveBeenCalledWith(instructionFor(activate),
9696
instructionFor(OneController));
@@ -108,7 +108,7 @@ describe('ngOutlet', function () {
108108
]);
109109
compile('<div ng-outlet></div>');
110110

111-
$router.navigate('/user');
111+
$router.navigateByUrl('/user');
112112
$rootScope.$digest();
113113

114114
expect(injectedScope).toBeDefined();
@@ -127,9 +127,9 @@ describe('ngOutlet', function () {
127127
]);
128128
compile('<div ng-outlet></div>');
129129

130-
$router.navigate('/a');
130+
$router.navigateByUrl('/a');
131131
$rootScope.$digest();
132-
$router.navigate('/b');
132+
$router.navigateByUrl('/b');
133133
$rootScope.$digest();
134134
expect(spy).toHaveBeenCalled();
135135
});
@@ -147,9 +147,9 @@ describe('ngOutlet', function () {
147147
]);
148148
compile('<div ng-outlet></div>');
149149

150-
$router.navigate('/user/brian');
150+
$router.navigateByUrl('/user/brian');
151151
$rootScope.$digest();
152-
$router.navigate('/post/123');
152+
$router.navigateByUrl('/post/123');
153153
$rootScope.$digest();
154154
expect(spy).toHaveBeenCalledWith(instructionFor(OneController),
155155
instructionFor(deactivate));
@@ -177,9 +177,9 @@ describe('ngOutlet', function () {
177177
]);
178178
compile('outer { <div ng-outlet></div> }');
179179

180-
$router.navigate('/a');
180+
$router.navigateByUrl('/a');
181181
$rootScope.$digest();
182-
$router.navigate('/b');
182+
$router.navigateByUrl('/b');
183183
$rootScope.$digest();
184184

185185
expect(log).toEqual(['deactivate', 'activate']);
@@ -207,13 +207,13 @@ describe('ngOutlet', function () {
207207
]);
208208
compile('outer { <div ng-outlet></div> }');
209209

210-
$router.navigate('/on-reuse/1/a');
210+
$router.navigateByUrl('/on-reuse/1/a');
211211
$rootScope.$digest();
212212
expect(log).toEqual([]);
213213
expect(cmpInstanceCount).toBe(1);
214214
expect(elt.text()).toBe('outer { reuse {one} }');
215215

216-
$router.navigate('/on-reuse/2/b');
216+
$router.navigateByUrl('/on-reuse/2/b');
217217
$rootScope.$digest();
218218
expect(log).toEqual(['reuse: on-reuse/1 -> on-reuse/2']);
219219
expect(cmpInstanceCount).toBe(1);
@@ -242,13 +242,13 @@ describe('ngOutlet', function () {
242242
]);
243243
compile('outer { <div ng-outlet></div> }');
244244

245-
$router.navigate('/never-reuse/1/a');
245+
$router.navigateByUrl('/never-reuse/1/a');
246246
$rootScope.$digest();
247247
expect(log).toEqual([]);
248248
expect(cmpInstanceCount).toBe(1);
249249
expect(elt.text()).toBe('outer { reuse {one} }');
250250

251-
$router.navigate('/never-reuse/2/b');
251+
$router.navigateByUrl('/never-reuse/2/b');
252252
$rootScope.$digest();
253253
expect(log).toEqual([]);
254254
expect(cmpInstanceCount).toBe(2);
@@ -270,7 +270,7 @@ describe('ngOutlet', function () {
270270
]);
271271
compile('outer { <div ng-outlet></div> }');
272272

273-
$router.navigate('/a');
273+
$router.navigateByUrl('/a');
274274
$rootScope.$digest();
275275

276276
expect(spy).not.toHaveBeenCalled();
@@ -292,7 +292,7 @@ describe('ngOutlet', function () {
292292
]);
293293
compile('<div ng-outlet></div>');
294294

295-
$router.navigate('/a');
295+
$router.navigateByUrl('/a');
296296
$rootScope.$digest();
297297

298298
expect(spy).toHaveBeenCalled();
@@ -314,7 +314,7 @@ describe('ngOutlet', function () {
314314
]);
315315
compile('<div ng-outlet></div>');
316316

317-
$router.navigate('/a');
317+
$router.navigateByUrl('/a');
318318
$rootScope.$digest();
319319

320320
expect(spy).toHaveBeenCalled();
@@ -335,7 +335,7 @@ describe('ngOutlet', function () {
335335
]);
336336
compile('<div ng-outlet></div>');
337337

338-
$router.navigate('/user/brian');
338+
$router.navigateByUrl('/user/brian');
339339
$rootScope.$digest();
340340
expect(spy).toHaveBeenCalledWith({name: 'brian'}, $http);
341341
}));
@@ -354,11 +354,11 @@ describe('ngOutlet', function () {
354354
]);
355355
compile('outer { <div ng-outlet></div> }');
356356

357-
$router.navigate('/a');
357+
$router.navigateByUrl('/a');
358358
$rootScope.$digest();
359359
expect(elt.text()).toBe('outer { hi }');
360360

361-
$router.navigate('/b');
361+
$router.navigateByUrl('/b');
362362
$rootScope.$digest();
363363
expect(elt.text()).toBe('outer { hi }');
364364
});
@@ -377,11 +377,11 @@ describe('ngOutlet', function () {
377377
]);
378378
compile('outer { <div ng-outlet></div> }');
379379

380-
$router.navigate('/a');
380+
$router.navigateByUrl('/a');
381381
$rootScope.$digest();
382382
expect(elt.text()).toBe('outer { hi }');
383383

384-
$router.navigate('/b');
384+
$router.navigateByUrl('/b');
385385
$rootScope.$digest();
386386
expect(elt.text()).toBe('outer { one }');
387387
});
@@ -401,7 +401,7 @@ describe('ngOutlet', function () {
401401
]);
402402
compile('<div ng-outlet></div>');
403403

404-
$router.navigate('/a');
404+
$router.navigateByUrl('/a');
405405
$rootScope.$digest();
406406

407407
expect(spy).toHaveBeenCalled();
@@ -421,9 +421,9 @@ describe('ngOutlet', function () {
421421
]);
422422
compile('<div ng-outlet></div>');
423423

424-
$router.navigate('/user/brian');
424+
$router.navigateByUrl('/user/brian');
425425
$rootScope.$digest();
426-
$router.navigate('/post/123');
426+
$router.navigateByUrl('/post/123');
427427
$rootScope.$digest();
428428
expect(spy).toHaveBeenCalledWith(instructionFor(OneController),
429429
instructionFor(deactivate));

‎modules/angular1_router/test/integration/navigation_spec.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('navigation', function () {
4343
{ path: '/', component: OneController }
4444
]);
4545

46-
$router.navigate('/');
46+
$router.navigateByUrl('/');
4747
$rootScope.$digest();
4848

4949
expect(elt.text()).toBe('one');
@@ -59,7 +59,7 @@ describe('navigation', function () {
5959

6060
spyOn(console, 'warn');
6161
compile('<ng-outlet></ng-outlet>');
62-
$router.navigate('/');
62+
$router.navigateByUrl('/');
6363

6464
expect(console.warn).toHaveBeenCalledWith('Could not find controller for', 'NoControllerController');
6565
expect(elt.text()).toBe('4');
@@ -72,11 +72,11 @@ describe('navigation', function () {
7272
]);
7373
compile('<ng-outlet></ng-outlet>');
7474

75-
$router.navigate('/user/brian');
75+
$router.navigateByUrl('/user/brian');
7676
$rootScope.$digest();
7777
expect(elt.text()).toBe('hello brian');
7878

79-
$router.navigate('/user/igor');
79+
$router.navigateByUrl('/user/igor');
8080
$rootScope.$digest();
8181
expect(elt.text()).toBe('hello igor');
8282
});
@@ -97,14 +97,14 @@ describe('navigation', function () {
9797
]);
9898
compile('<ng-outlet></ng-outlet>');
9999

100-
$router.navigate('/parent/user/brian');
100+
$router.navigateByUrl('/parent/user/brian');
101101
$rootScope.$digest();
102102
expect(spy).toHaveBeenCalled();
103103
expect(elt.text()).toBe('parent { hello brian }');
104104

105105
spy.calls.reset();
106106

107-
$router.navigate('/parent/user/igor');
107+
$router.navigateByUrl('/parent/user/igor');
108108
$rootScope.$digest();
109109
expect(spy).not.toHaveBeenCalled();
110110
expect(elt.text()).toBe('parent { hello igor }');
@@ -121,7 +121,7 @@ describe('navigation', function () {
121121
]);
122122
compile('<div>outer { <div ng-outlet></div> }</div>');
123123

124-
$router.navigate('/a/b');
124+
$router.navigateByUrl('/a/b');
125125
$rootScope.$digest();
126126

127127
expect(elt.text()).toBe('outer { inner { one } }');
@@ -136,7 +136,7 @@ describe('navigation', function () {
136136
]);
137137

138138
compile('<div>root { <div ng-outlet></div> }</div>');
139-
$router.navigate('/');
139+
$router.navigateByUrl('/');
140140
$rootScope.$digest();
141141
expect(elt.text()).toBe('root { one }');
142142
});
@@ -152,7 +152,7 @@ describe('navigation', function () {
152152
]);
153153
compile('<div ng-outlet></div>');
154154

155-
$router.navigate('/user');
155+
$router.navigateByUrl('/user');
156156
$rootScope.$digest();
157157

158158
expect(injectedScope).toBeDefined();
@@ -166,7 +166,7 @@ describe('navigation', function () {
166166

167167
compile('<div ng-outlet></div>');
168168

169-
$router.navigate('/user');
169+
$router.navigateByUrl('/user');
170170
$rootScope.$digest();
171171

172172
expect($location.path()).toBe('/user');
@@ -181,7 +181,7 @@ describe('navigation', function () {
181181
{ path: '/user', component: UserController }
182182
]);
183183

184-
$router.navigate('/');
184+
$router.navigateByUrl('/');
185185
$rootScope.$digest();
186186

187187
expect($location.path()).toBe('/user');
@@ -203,13 +203,13 @@ describe('navigation', function () {
203203

204204
compile('<div ng-outlet></div>');
205205

206-
$router.navigate('/old-parent/old-child');
206+
$router.navigateByUrl('/old-parent/old-child');
207207
$rootScope.$digest();
208208

209209
expect($location.path()).toBe('/new-parent/new-child');
210210
expect(elt.text()).toBe('inner { one }');
211211

212-
$router.navigate('/old-parent/old-child-two');
212+
$router.navigateByUrl('/old-parent/old-child-two');
213213
$rootScope.$digest();
214214

215215
expect($location.path()).toBe('/new-parent/new-child-two');
@@ -243,7 +243,7 @@ describe('navigation', function () {
243243
]);
244244
compile('<div ng-outlet></div>');
245245

246-
$router.navigate('/pendingActivate');
246+
$router.navigateByUrl('/pendingActivate');
247247
$rootScope.$digest();
248248
expect($router.navigating).toBe(true);
249249
defer.resolve();

‎modules/angular1_router/test/ng_link_spec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('ngOutlet', function () {
4242
]);
4343
compile('<a ng-link="[\'/two\']">link</a> | outer { <div ng-outlet></div> }');
4444

45-
$router.navigate('/a');
45+
$router.navigateByUrl('/a');
4646
$rootScope.$digest();
4747

4848
expect(elt.find('a').attr('href')).toBe('./b');
@@ -57,7 +57,7 @@ describe('ngOutlet', function () {
5757
]);
5858
compile('outer { <div ng-outlet></div> }');
5959

60-
$router.navigate('/a');
60+
$router.navigateByUrl('/a');
6161
$rootScope.$digest();
6262

6363
expect(elt.find('a').attr('href')).toBe('./b');
@@ -74,7 +74,7 @@ describe('ngOutlet', function () {
7474
]);
7575
compile('<div ng-outlet></div>');
7676

77-
$router.navigate('/a');
77+
$router.navigateByUrl('/a');
7878
$rootScope.$digest();
7979

8080
expect(elt.find('a').attr('href')).toBe('./b/lol');
@@ -91,7 +91,7 @@ describe('ngOutlet', function () {
9191
]);
9292
compile('<div ng-outlet></div>');
9393

94-
$router.navigate('/a');
94+
$router.navigateByUrl('/a');
9595
$rootScope.$digest();
9696

9797
expect(elt.find('a').attr('href')).toBe('./b/one');

0 commit comments

Comments
 (0)