fix(ngClass): support multiple classes in key

shahata · btford · commit 85ce5d0db9fc · 2014-05-30T11:56:27.000-07:00
diff --git a/src/ng/directive/ngClass.js b/src/ng/directive/ngClass.js
@@ -106,7 +106,7 @@ function classDirective(name, selector) {
         var classes = [], i = 0;
         forEach(classVal, function(v, k) {
           if (v) {
-            classes.push(k);
+            classes = classes.concat(k.split(' '));
           }
         });
         return classes;
diff --git a/test/ng/directive/ngClassSpec.js b/test/ng/directive/ngClassSpec.js
@@ -207,6 +207,23 @@ describe('ngClass', function() {
       expect(e2.hasClass('odd')).toBeTruthy();
   }));
 
+  it('should allow ngClass with overlapping classes', inject(function($rootScope, $compile, $animate) {
+      element = $compile('<div ng-class="{\'same yes\': test, \'same no\': !test}"></div>')($rootScope);
+      $rootScope.$digest();
+
+      expect(element).toHaveClass('same');
+      expect(element).not.toHaveClass('yes');
+      expect(element).toHaveClass('no');
+
+      $rootScope.$apply(function() {
+        $rootScope.test = true;
+      });
+
+      expect(element).toHaveClass('same');
+      expect(element).toHaveClass('yes');
+      expect(element).not.toHaveClass('no');
+  }));
+
   it('should allow both ngClass and ngClassOdd/Even with multiple classes', inject(function($rootScope, $compile) {
     element = $compile('<ul>' +
       '<li ng-repeat="i in [0,1]" ng-class="[\'A\', \'B\']" ' +

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ function classDirective(name, selector) {`
`106`	`106`	`var classes = [], i = 0;`
`107`	`107`	`forEach(classVal, function(v, k) {`
`108`	`108`	`if (v) {`
`109`		`- classes.push(k);`
	`109`	`+ classes = classes.concat(k.split(' '));`
`110`	`110`	`}`
`111`	`111`	`});`
`112`	`112`	`return classes;`