fixes #307

marko-js · Jun 14, 2016 · 01f8a24 · 01f8a24
1 parent a60d007
commit 01f8a24
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/compiler/Parser.js b/compiler/Parser.js
@@ -56,8 +56,8 @@ function mergeShorthandClassNames(el, shorthandClassNames, context) {
             prevClassName.value += ' ' + className.value;
         } else {
             finalClassNames.push(className);
+            prevClassName = className;
         }
-        prevClassName = className;
     }
 
     if (finalClassNames.length === 1) {

diff --git a/test/autotests/render/shorthand-classes-many-classes/expected.html b/test/autotests/render/shorthand-classes-many-classes/expected.html
@@ -0,0 +1 @@
+<div class="foo bar baz bat"></div><div class="foo bar test123 baz"></div><div class="foo bar baz test"></div>
diff --git a/test/autotests/render/shorthand-classes-many-classes/template.marko b/test/autotests/render/shorthand-classes-many-classes/template.marko
@@ -0,0 +1,3 @@
+.foo.bar.baz.bat
+.foo.bar.${data.cls}.baz
+.foo.bar.baz class="test"
diff --git a/test/autotests/render/shorthand-classes-many-classes/test.js b/test/autotests/render/shorthand-classes-many-classes/test.js
@@ -0,0 +1,3 @@
+exports.templateData = {
+    cls: 'test123'
+};