Skip to content

Commit 510ab37

Browse files
artchartch
committed
Fix a bug when inner segments are not reset properly while resolving the data
1 parent 6e2a06e commit 510ab37

File tree

5 files changed

+125
-17
lines changed

5 files changed

+125
-17
lines changed

‎build/angular-route-segment.js

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-route-segment v1.2.0
2+
* angular-route-segment
33
* https://angular-route-segment.com
44
* @author Artem Chivchalov
55
* @license MIT License http://opensource.org/licenses/MIT
@@ -205,10 +205,10 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
205205

206206
var newSegment = getSegmentInChain( i, segmentNameChain );
207207

208-
if(resolvingSemaphoreChain[i] != newSegment.name || isDependenciesChanged(newSegment)) {
208+
if(resolvingSemaphoreChain[i] != newSegment.name || updates.length > 0 || isDependenciesChanged(newSegment)) {
209209

210210
if($routeSegment.chain[i] && $routeSegment.chain[i].name == newSegment.name &&
211-
!isDependenciesChanged(newSegment))
211+
updates.length == 0 && !isDependenciesChanged(newSegment))
212212
// if we went back to the same state as we were before resolving new segment
213213
resolvingSemaphoreChain[i] = newSegment.name;
214214
else
@@ -219,6 +219,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
219219
var curSegmentPromise = $q.when();
220220

221221
if(updates.length > 0) {
222+
222223
for(var i=0; i<updates.length; i++) {
223224
(function(i) {
224225
curSegmentPromise = curSegmentPromise.then(function() {
@@ -228,13 +229,27 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
228229
}).then(function(result) {
229230

230231
if(result.success != undefined) {
232+
231233
broadcast(result.success);
234+
235+
for(var j = updates[i].index + 1; j < $routeSegment.chain.length; j++) {
236+
237+
if($routeSegment.chain[j]) {
238+
$routeSegment.chain[j] = null;
239+
updateSegment(j, null);
240+
}
241+
}
242+
243+
232244
}
233245
})
234246
})(i);
235247
}
248+
236249
}
237250

251+
252+
238253
curSegmentPromise.then(function() {
239254

240255
// Removing redundant segment in case if new segment chain is shorter than old one
@@ -262,16 +277,19 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
262277
});
263278
return result;
264279
}
265-
266-
function updateSegment(index, segment) {
280+
281+
function updateSegment(index, segment, isBroadcast) {
282+
283+
if(typeof isBroadcast === 'undefined')
284+
isBroadcast = true;
267285

268286
if($routeSegment.chain[index] && $routeSegment.chain[index].clearWatcher) {
269287
$routeSegment.chain[index].clearWatcher();
270288
}
271289

272290
if(!segment) {
273291
resolvingSemaphoreChain[index] = null;
274-
broadcast(index);
292+
isBroadcast && broadcast(index);
275293
return;
276294
}
277295

@@ -281,7 +299,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
281299
return resolve(index, segment.name, segment.params.untilResolved)
282300
.then(function(result) {
283301
if(result.success != undefined)
284-
broadcast(index);
302+
isBroadcast && broadcast(index);
285303
return resolve(index, segment.name, segment.params);
286304
})
287305
}
@@ -306,7 +324,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
306324
.then(function(response) {
307325
return response.data;
308326
});
309-
327+
310328
return $q.all(locals).then(
311329

312330
function(resolvedLocals) {
@@ -371,7 +389,8 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
371389

372390
$routeSegment.name = '';
373391
for(var i=0; i<$routeSegment.chain.length; i++)
374-
$routeSegment.name += $routeSegment.chain[i].name+".";
392+
if($routeSegment.chain[i])
393+
$routeSegment.name += $routeSegment.chain[i].name+".";
375394
$routeSegment.name = $routeSegment.name.substr(0, $routeSegment.name.length-1);
376395

377396
$rootScope.$broadcast( 'routeSegmentChange', {

‎build/angular-route-segment.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/route-segment.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
213213
var curSegmentPromise = $q.when();
214214

215215
if(updates.length > 0) {
216+
216217
for(var i=0; i<updates.length; i++) {
217218
(function(i) {
218219
curSegmentPromise = curSegmentPromise.then(function() {
@@ -222,13 +223,27 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
222223
}).then(function(result) {
223224

224225
if(result.success != undefined) {
226+
225227
broadcast(result.success);
228+
229+
for(var j = updates[i].index + 1; j < $routeSegment.chain.length; j++) {
230+
231+
if($routeSegment.chain[j]) {
232+
$routeSegment.chain[j] = null;
233+
updateSegment(j, null);
234+
}
235+
}
236+
237+
226238
}
227239
})
228240
})(i);
229241
}
242+
230243
}
231244

245+
246+
232247
curSegmentPromise.then(function() {
233248

234249
// Removing redundant segment in case if new segment chain is shorter than old one
@@ -256,7 +271,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
256271
});
257272
return result;
258273
}
259-
274+
260275
function updateSegment(index, segment) {
261276

262277
if($routeSegment.chain[index] && $routeSegment.chain[index].clearWatcher) {
@@ -300,7 +315,7 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
300315
.then(function(response) {
301316
return response.data;
302317
});
303-
318+
304319
return $q.all(locals).then(
305320

306321
function(resolvedLocals) {
@@ -365,7 +380,8 @@ angular.module( 'route-segment', [] ).provider( '$routeSegment',
365380

366381
$routeSegment.name = '';
367382
for(var i=0; i<$routeSegment.chain.length; i++)
368-
$routeSegment.name += $routeSegment.chain[i].name+".";
383+
if($routeSegment.chain[i])
384+
$routeSegment.name += $routeSegment.chain[i].name+".";
369385
$routeSegment.name = $routeSegment.name.substr(0, $routeSegment.name.length-1);
370386

371387
$rootScope.$broadcast( 'routeSegmentChange', {

‎test/unit/route-segment.spec.js

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,10 @@ describe('route segment', function() {
247247

248248
$rootScope.$digest();
249249
expect($routeSegment.name).toBe('section-first');
250-
expect(callback.calls.length).toBe(2);
250+
//expect(callback.calls.length).toBe(2);
251+
expect(callback.calls[0].args[1].index).toBe(0);
251252
expect(callback.calls[0].args[1].segment.name).toBe('section-first');
253+
expect(callback.calls[1].args[1].index).toBe(1);
252254
expect(callback.calls[1].args[1].segment).toBe(null);
253255
})
254256

@@ -388,17 +390,19 @@ describe('route segment', function() {
388390

389391
describe('resolving', function() {
390392

391-
var resolve;
393+
var resolve, resolveInner;
392394

393395
beforeEach(function() {
394-
resolve = {};
395-
$routeSegmentProvider.when('/3', 'section3');
396+
resolve = {}, resolveInner = {};
397+
$routeSegmentProvider.when('/3', 'section3');
398+
$routeSegmentProvider.when('/3/1', 'section3.section31');
396399
})
397400

398401
describe('without `untilResolved`', function() {
399402

400403
beforeEach(function() {
401404
$routeSegmentProvider.segment('section3', {resolve: resolve});
405+
$routeSegmentProvider.within('section3').segment('section31', {resolve: resolveInner});
402406
})
403407

404408
it('should resolve a param as function', inject(function($q) {
@@ -520,10 +524,33 @@ describe('route segment', function() {
520524

521525
$rootScope.$digest();
522526
expect(callback).not.toHaveBeenCalled();
527+
523528
expect($routeSegment.chain[0].name).toEqual('section2');
524529
expect($routeSegment.chain[1].name).toEqual('section21');
525530
expect($routeSegment.name).toEqual('section2.section21');
526531
}))
532+
533+
it('should reset 2nd-level segment while loading when first-level is changed', inject(function($q) {
534+
535+
var defer = $q.defer();
536+
resolveInner.param1 = function() { return defer.promise; };
537+
538+
$location.path('/2/X');
539+
$rootScope.$digest();
540+
$location.path('/3/1');
541+
542+
$rootScope.$digest();
543+
expect($routeSegment.name).toBe('section3');
544+
expect($routeSegment.chain[1]).toBe(null);
545+
546+
547+
defer.resolve();
548+
549+
$rootScope.$digest();
550+
expect($routeSegment.name).toBe('section3.section31');
551+
expect($routeSegment.chain.length).toBe(2);
552+
553+
}))
527554
})
528555

529556
describe('with `untilResolved`', function() {

0 commit comments

Comments
 (0)