Skip to content

Commit 4cea4ed

Browse files
author
Caitlin Potter
committed
chore(uiSrefActive): rename uiStateActive to uiSrefActive
Renamed to reflect the association with the ui-sref directive.
1 parent 13079ec commit 4cea4ed

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/stateDirectives.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ $StateRefDirective.$inject = ['$state'];
1616
function $StateRefDirective($state) {
1717
return {
1818
restrict: 'A',
19-
require: '?^uiStateActive',
20-
link: function(scope, element, attrs, uiStateActive) {
19+
require: '?^uiSrefActive',
20+
link: function(scope, element, attrs, uiSrefActive) {
2121
var ref = parseStateRef(attrs.uiSref);
2222
var params = null, url = null, base = stateContext(element) || $state.$current;
2323
var isForm = element[0].nodeName === "FORM";
@@ -34,8 +34,8 @@ function $StateRefDirective($state) {
3434
return false;
3535
}
3636
element[0][attr] = newHref;
37-
if (uiStateActive) {
38-
uiStateActive.$$setStateInfo(ref.state, params);
37+
if (uiSrefActive) {
38+
uiSrefActive.$$setStateInfo(ref.state, params);
3939
}
4040
};
4141

@@ -71,9 +71,9 @@ function $StateActiveDirective($state, $stateParams, $interpolate) {
7171
var state, params, activeClass;
7272

7373
// There probably isn't much point in $observing this
74-
activeClass = $interpolate($attrs.uiStateActive || '', false)($scope);
74+
activeClass = $interpolate($attrs.uiSrefActive || '', false)($scope);
7575

76-
// Allow uiSref to communicate with uiStateActive
76+
// Allow uiSref to communicate with uiSrefActive
7777
this.$$setStateInfo = function(newState, newParams) {
7878
state = $state.get(newState, stateContext($element));
7979
params = newParams;
@@ -100,4 +100,4 @@ function $StateActiveDirective($state, $stateParams, $interpolate) {
100100

101101
angular.module('ui.router.state')
102102
.directive('uiSref', $StateRefDirective)
103-
.directive('uiStateActive', $StateActiveDirective);
103+
.directive('uiSrefActive', $StateActiveDirective);

test/stateDirectivesSpec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ describe('uiStateRef', function() {
218218
});
219219
});
220220

221-
describe('uiStateActive', function() {
221+
describe('uiSrefActive', function() {
222222
var el, template, scope, document;
223223

224224
beforeEach(module('ui.router'));
@@ -230,7 +230,7 @@ describe('uiStateActive', function() {
230230
url: '/contacts',
231231
views: {
232232
'@': {
233-
template: '<a ui-sref=".item({ id: 6 })" ui-state-active="active">Contacts</a>'
233+
template: '<a ui-sref=".item({ id: 6 })" ui-sref-active="active">Contacts</a>'
234234
}
235235
}
236236
}).state('contacts.item', {
@@ -245,7 +245,7 @@ describe('uiStateActive', function() {
245245
}));
246246

247247
it('should update class for sibling uiSref', inject(function($rootScope, $q, $compile, $state) {
248-
el = angular.element('<div><a ui-sref="contacts" ui-state-active="active">Contacts</a></div>');
248+
el = angular.element('<div><a ui-sref="contacts" ui-sref-active="active">Contacts</a></div>');
249249
template = $compile(el)($rootScope);
250250
$rootScope.$digest();
251251

@@ -261,7 +261,7 @@ describe('uiStateActive', function() {
261261
}));
262262

263263
it('should match state\'s parameters', inject(function($rootScope, $q, $compile, $state) {
264-
el = angular.element('<div><a ui-sref="contacts.item.detail({ foo: \'bar\' })" ui-state-active="active">Contacts</a></div>');
264+
el = angular.element('<div><a ui-sref="contacts.item.detail({ foo: \'bar\' })" ui-sref-active="active">Contacts</a></div>');
265265
template = $compile(el)($rootScope);
266266
$rootScope.$digest();
267267

0 commit comments

Comments
 (0)