fix url parsing with quotes

chad3814 · Jul 9, 2015 · b227785 · b227785
1 parent ae78f43
commit b227785
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/lib/parsers.js b/lib/parsers.js
@@ -220,11 +220,11 @@ exports.parseUrl = function parseUrl(val) {
     }
     var str = res[1];
     // if it starts with single or double quotes, does it end with the same?
-    if ((str[1] === '"' || str[1] === "'") && str[1] !== str[str.length - 1]) {
+    if ((str[0] === '"' || str[0] === "'") && str[0] !== str[str.length - 1]) {
         return undefined;
     }
-    if (str[1] === '"' || str[1] === "'") {
-        str = str.substr(1, -1);
+    if (str[0] === '"' || str[0] === "'") {
+        str = str.substr(1, str.length - 2);
     }
 
     var i;
@@ -243,6 +243,7 @@ exports.parseUrl = function parseUrl(val) {
             break;
         }
     }
+
     return 'url(' + str + ')';
 };
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "cssstyle",
     "description": "CSSStyleDeclaration Object Model implementation",
     "keywords": ["CSS", "CSSStyleDeclaration", "StyleSheet"],
-    "version": "0.2.28",
+    "version": "0.2.29",
     "homepage": "https://github.com/chad3814/CSSStyleDeclaration",
     "maintainers": [{
         "name": "Chad Walker",

diff --git a/tests/tests.js b/tests/tests.js
@@ -309,5 +309,16 @@ module.exports = {
         style.cssText = 'float: ';
         test.ok('' === style.cssText, 'cssText wasn\'t cleared: ' + style.cssText);
         test.done();
+    },
+    'Make sure url parsing works with quotes': function (test) {
+        var style = new cssstyle.CSSStyleDeclaration();
+        test.expect(3);
+        style.backgroundImage = 'url(http://some/url/here1.png)';
+        test.ok('url(http://some/url/here1.png)' === style.backgroundImage, 'background-image wasn\'t url(http://some/url/here1.png): ' + style.backgroundImage);
+        style.backgroundImage = 'url(\'http://some/url/here2.png\')';
+        test.ok('url(http://some/url/here2.png)' === style.backgroundImage, 'background-image wasn\'t url(http://some/url/here2.png): ' + style.backgroundImage);
+        style.backgroundImage = 'url("http://some/url/here3.png")';
+        test.ok('url(http://some/url/here3.png)' === style.backgroundImage, 'background-image wasn\'t url(http://some/url/here3.png): ' + style.backgroundImage);
+        test.done();
     }
 };