Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-17 07:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ng:class): support using map of classnames and conditions

Browse source 
enables <div ng:class="{'hide': !visible, 'warning': isAlert()}"...
This commit is contained in:
Kai Groner 2012-01-19 22:39:32 -05:00 committed by Igor Minar
parent b2052d08a1
commit 56bcc04c54
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/directives.js
View file

@ -527,8 +527,12 @@ function ngClass(selector) {
scope.$watch(expression, function(newVal, oldVal) {
if (selector(scope.$index)) {
if (oldVal && (newVal !== oldVal)) {
if (isObject(oldVal) && !isArray(oldVal))
oldVal = map(oldVal, function(v, k) { if (v) return k });
element.removeClass(isArray(oldVal) ? oldVal.join(' ') : oldVal);
}
if (isObject(newVal) && !isArray(newVal))
newVal = map(newVal, function(v, k) { if (v) return k });
if (newVal) element.addClass(isArray(newVal) ? newVal.join(' ') : newVal);
}
});
@ -551,7 +555,8 @@ function ngClass(selector) {
*
* @element ANY
* @param {expression} expression {@link guide/dev_guide.expressions Expression} to eval. The result
* of the evaluation can be a string representing space delimited class names or an array.
* of the evaluation can be a string representing space delimited class
* names, an array, or a map of class names to boolean values.
*
* @example
<doc:example>

22
test/directivesSpec.js
View file

@ -200,6 +200,28 @@ describe("directive", function() {
}));
it('should support adding multiple classes conditionally via a map of class names to boolean' +
'expressions', inject(function($rootScope, $compile) {
var element = $compile(
'<div class="existing" ' +
'ng:class="{A: conditionA, B: conditionB(), AnotB: conditionA&&!conditionB}">' +
'</div>')($rootScope);
$rootScope.conditionA = true;
$rootScope.$digest();
expect(element.hasClass('existing')).toBeTruthy();
expect(element.hasClass('A')).toBeTruthy();
expect(element.hasClass('B')).toBeFalsy();
expect(element.hasClass('AnotB')).toBeTruthy();
$rootScope.conditionB = function() { return true };
$rootScope.$digest();
expect(element.hasClass('existing')).toBeTruthy();
expect(element.hasClass('A')).toBeTruthy();
expect(element.hasClass('B')).toBeTruthy();
expect(element.hasClass('AnotB')).toBeFalsy();
}));
it('should support adding multiple classes via a space delimited string', inject(function($rootScope, $compile) {
var element = $compile('<div class="existing" ng:class="\'A B\'"></div>')($rootScope);
$rootScope.$digest();