Skip to content

Commit bf0f6de

Browse files
nateabelenateabele
committed
Merge pull request #1809 from oriweingart/reload_state
feat($state): added 'state' to state reload method (feat no.1612)
2 parents 985c57a + b8f0457 commit bf0f6de

File tree

2 files changed

+159
-5
lines changed

2 files changed

+159
-5
lines changed

‎src/state.js‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -820,11 +820,33 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
820820
* });
821821
* </pre>
822822
*
823+
* @param {string=|object=} state - A state name or a state object, which is the root of the resolves to be re-resolved.
824+
* @example
825+
* <pre>
826+
* //assuming app application consists of 3 states: 'contacts', 'contacts.detail', 'contacts.detail.item'
827+
* //and current state is 'contacts.detail.item'
828+
* var app angular.module('app', ['ui.router']);
829+
*
830+
* app.controller('ctrl', function ($scope, $state) {
831+
* $scope.reload = function(){
832+
* //will reload 'contact.detail' and 'contact.detail.item' states
833+
* $state.reload('contact.detail');
834+
* }
835+
* });
836+
* </pre>
837+
*
838+
* `reload()` is just an alias for:
839+
* <pre>
840+
* $state.transitionTo($state.current, $stateParams, {
841+
* reload: true, inherit: false, notify: true
842+
* });
843+
* </pre>
844+
823845
* @returns {promise} A promise representing the state of the new transition. See
824846
* {@link ui.router.state.$state#methods_go $state.go}.
825847
*/
826-
$state.reload = function reload() {
827-
return $state.transitionTo($state.current, $stateParams, { reload: true, inherit: false, notify: true });
848+
$state.reload = function reload(state) {
849+
return $state.transitionTo($state.current, $stateParams, { reload: state || true, inherit: false, notify: true});
828850
};
829851

830852
/**
@@ -928,9 +950,11 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
928950
* - **`relative`** - {object=}, When transitioning with relative path (e.g '^'),
929951
* defines which state to be relative from.
930952
* - **`notify`** - {boolean=true}, If `true` will broadcast $stateChangeStart and $stateChangeSuccess events.
931-
* - **`reload`** (v0.2.5) - {boolean=false}, If `true` will force transition even if the state or params
953+
* - **`reload`** (v0.2.5) - {boolean=false|string=|object=}, If `true` will force transition even if the state or params
932954
* have not changed, aka a reload of the same state. It differs from reloadOnSearch because you'd
933955
* use this when you want to force a reload when *everything* is the same, including search params.
956+
* if String, then will reload the state with the name given in reload, and any children.
957+
* if Object, then a stateObj is expected, will reload the state found in stateObj, and any chhildren.
934958
*
935959
* @returns {promise} A promise representing the state of the new transition. See
936960
* {@link ui.router.state.$state#methods_go $state.go}.
@@ -975,21 +999,39 @@ function $StateProvider( $urlRouterProvider, $urlMatcherFactory) {
975999

9761000
// Starting from the root of the path, keep all levels that haven't changed
9771001
var keep = 0, state = toPath[keep], locals = root.locals, toLocals = [];
1002+
var skipTriggerReloadCheck = false;
9781003

9791004
if (!options.reload) {
9801005
while (state && state === fromPath[keep] && state.ownParams.$$equals(toParams, fromParams)) {
9811006
locals = toLocals[keep] = state.locals;
9821007
keep++;
9831008
state = toPath[keep];
9841009
}
1010+
} else if (isString(options.reload) || isObject(options.reload)) {
1011+
if (isObject(options.reload) && !options.reload.name) {
1012+
throw new Error('Invalid reload state object');
1013+
}
1014+
1015+
var reloadState = options.reload === true ? fromPath[0] : findState(options.reload);
1016+
if (options.reload && !reloadState) {
1017+
throw new Error("No such reload state '" + (isString(options.reload) ? options.reload : options.reload.name) + "'");
1018+
}
1019+
1020+
skipTriggerReloadCheck = true;
1021+
1022+
while (state && state === fromPath[keep] && state !== reloadState) {
1023+
locals = toLocals[keep] = state.locals;
1024+
keep++;
1025+
state = toPath[keep];
1026+
}
9851027
}
9861028

9871029
// If we're going to the same state and all locals are kept, we've got nothing to do.
9881030
// But clear 'transition', as we still want to cancel any other pending transitions.
9891031
// TODO: We may not want to bump 'transition' if we're called from a location change
9901032
// that we've initiated ourselves, because we might accidentally abort a legitimate
9911033
// transition initiated from code?
992-
if (shouldTriggerReload(to, from, locals, options)) {
1034+
if (!skipTriggerReloadCheck && shouldTriggerReload(to, from, locals, options)) {
9931035
if (to.self.reloadOnSearch !== false) $urlRouter.update();
9941036
$state.transition = null;
9951037
return $q.when($state.current);

‎test/stateSpec.js‎

Lines changed: 113 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,30 @@ describe('state', function () {
113113
// State param inheritance tests. param1 is inherited by sub1 & sub2;
114114
// param2 should not be transferred (unless explicitly set).
115115
.state('root', { url: '^/root?param1' })
116-
.state('root.sub1', {url: '/1?param2' });
116+
.state('root.sub1', {url: '/1?param2' })
117+
.state('logA', {
118+
url: "/logA",
119+
template: "<div> <div ui-view/></div>",
120+
controller: function() {log += "logA;"}
121+
})
122+
.state('logA.logB', {
123+
url: "/logB",
124+
views:{
125+
'':{
126+
template: "<div> <div ui-view/></div>",
127+
controller: function() {log += "logB;"}
128+
}
129+
}
130+
})
131+
.state('logA.logB.logC', {
132+
url: "/logC",
133+
views:{
134+
'':{
135+
template: "<div> <div ui-view/></div>",
136+
controller: function() {log += "logC;"}
137+
}
138+
}
139+
})
117140
$stateProvider.state('root.sub2', {url: '/2?param2' });
118141

119142
$provide.value('AppInjectable', AppInjectable);
@@ -551,6 +574,92 @@ describe('state', function () {
551574
$q.flush();
552575
expect(log).toBe('Success!controller;Success!controller;');
553576
}));
577+
578+
it('should invoke the controllers by state when given state name', inject(function ($state, $q, $timeout, $rootScope, $compile) {
579+
$compile('<div> <div ui-view/></div>')($rootScope);
580+
$state.transitionTo('logA.logB.logC');
581+
$q.flush();
582+
expect(log).toBe('logA;logB;logC;');
583+
584+
log = '';
585+
$state.reload('logA');
586+
$q.flush();
587+
expect(log).toBe('logA;logB;logC;');
588+
589+
log = '';
590+
$state.reload('logA.logB');
591+
$q.flush();
592+
expect(log).toBe('logB;logC;');
593+
594+
log = '';
595+
$state.reload('logA.logB.logC');
596+
$q.flush();
597+
expect(log).toBe('logC;');
598+
}));
599+
600+
it('should reload all states when passing false', inject(function ($state, $q, $timeout, $rootScope, $compile) {
601+
$compile('<div> <div ui-view/></div>')($rootScope);
602+
$state.transitionTo('logA.logB.logC');
603+
$q.flush();
604+
expect(log).toBe('logA;logB;logC;');
605+
606+
log = '';
607+
$state.reload(false);
608+
$q.flush();
609+
expect(log).toBe('logA;logB;logC;');
610+
}));
611+
612+
it('should reload all states when passing true', inject(function ($state, $q, $timeout, $rootScope, $compile) {
613+
$compile('<div> <div ui-view/></div>')($rootScope);
614+
$state.transitionTo('logA.logB.logC');
615+
$q.flush();
616+
expect(log).toBe('logA;logB;logC;');
617+
618+
log = '';
619+
$state.reload(true);
620+
$q.flush();
621+
expect(log).toBe('logA;logB;logC;');
622+
}));
623+
624+
625+
it('should invoke the controllers by state when given stateObj', inject(function ($state, $q, $timeout, $rootScope, $compile) {
626+
$compile('<div> <div ui-view/></div>')($rootScope);
627+
$state.transitionTo('logA.logB.logC');
628+
629+
$q.flush();
630+
expect(log).toBe('logA;logB;logC;');
631+
632+
log = '';
633+
$state.reload($state.current);
634+
$q.flush();
635+
expect(log).toBe('logC;');
636+
}));
637+
638+
it('should throw an exception for invalid reload state name', inject(function ($state, $q, $timeout, $rootScope, $compile) {
639+
$compile('<div> <div ui-view/></div>')($rootScope);
640+
$state.transitionTo('logA.logB.logC');
641+
$q.flush();
642+
expect(log).toBe('logA;logB;logC;');
643+
644+
expect(function(){
645+
$state.reload('logInvalid')}
646+
).toThrow("No such reload state 'logInvalid'");
647+
}));
648+
649+
it('should throw an exception for invalid reload state object', inject(function ($state, $q, $timeout, $rootScope, $compile) {
650+
$compile('<div> <div ui-view/></div>')($rootScope);
651+
$state.transitionTo('logA.logB.logC');
652+
$q.flush();
653+
expect(log).toBe('logA;logB;logC;');
654+
655+
expect(function(){
656+
$state.reload({foo:'bar'})}
657+
).toThrow("Invalid reload state object");
658+
659+
expect(function(){
660+
$state.reload({name:'invalidState'})}
661+
).toThrow("No such reload state 'invalidState'");
662+
}));
554663
});
555664

556665
describe('.is()', function () {
@@ -804,6 +913,9 @@ describe('state', function () {
804913
'home.item',
805914
'home.redirect',
806915
'json',
916+
'logA',
917+
'logA.logB',
918+
'logA.logB.logC',
807919
'resolveFail',
808920
'resolveTimeout',
809921
'root',

0 commit comments

Comments
 (0)