Merge pull request #2256 from asturur/fix-style-parsing

Fix style parsing
fabricjs · Jun 3, 2015 · d817ae6 · d817ae6
2 parents 023d293 + 4523835
commit d817ae6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/parser.js b/src/parser.js
@@ -275,7 +275,7 @@
    */
   function parseStyleString(style, oStyle) {
     var attr, value;
-    style.replace(/;$/, '').split(';').forEach(function (chunk) {
+    style.replace(/;\s*$/, '').split(';').forEach(function (chunk) {
       var pair = chunk.split(':');
 
       attr = normalizeAttr(pair[0].trim().toLowerCase());

diff --git a/test/unit/parser.js b/test/unit/parser.js
@@ -146,6 +146,17 @@
     deepEqual(fabric.parseStyleAttribute(element), expectedObject);
   });
 
+  test('parseStyleAttribute with trailing spaces', function() {
+    var element = fabric.document.createElement('path');
+    element.setAttribute('style', 'left:10px;  top:5px;  ');
+
+    var expectedObject = {
+      'left': 10,
+      'top': 5
+    };
+    deepEqual(fabric.parseStyleAttribute(element), expectedObject);
+  });
+
   test('parseStyleAttribute with value normalization', function() {
     var element = fabric.document.createElement('path');
     element.setAttribute('style', 'fill:none;  stroke-dasharray: 2 0.4;');