fix(layout): Prevent class overriding when lastClass is null

This fixes an annoying behavior of the layout attributes that is removing all the element's other classes when trying to convert layout attributes to classes. Closes #5257.
angular · Oct 20, 2015 · 9025f4d · 9025f4d
1 parent 7f82fe4
commit 9025f4d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/services/layout/layout.js b/src/core/services/layout/layout.js
@@ -322,8 +322,10 @@
     return function updateClassFn(newValue) {
       var value = validateAttributeValue(className, newValue || "");
       if ( angular.isDefined(value) ) {
-        element.removeClass(lastClass);
-        lastClass = !value ? className : className + "-" + value.replace(WHITESPACE, "-")
+        if (lastClass) { 
+          element.removeClass(lastClass);
+        }
+        lastClass = !value ? className : className + "-" + value.replace(WHITESPACE, "-");
         element.addClass(lastClass);
       }
     };