Merge pull request phoenixframework#1614 from hamann/fix-digester-for…

…-compressed-css Fix regex to match urls in compressed stylesheets
coderberry · Mar 28, 2016 · 1250f6d · 1250f6d
2 parents 2920beb + c1f29d3
commit 1250f6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/phoenix/digester.ex b/lib/phoenix/digester.ex
@@ -112,7 +112,7 @@ defmodule Phoenix.Digester do
     end
   end
 
-  @stylesheet_url_regex ~r{(url\(\s*)(\S+)(\s*\))}
+  @stylesheet_url_regex ~r{(url\(\s*)(\S+?)(\s*\))}
   @quoted_text_regex ~r{\A(['"])(.+)\1\z}
 
   defp digest_asset_references(file, manifest) do

diff --git a/test/fixtures/digest/priv/static/css/app.css b/test/fixtures/digest/priv/static/css/app.css
@@ -9,3 +9,7 @@
 .absolute_url_logo {
   background-image: url(http://www.phoenixframework.org/absolute.png);
 }
+
+.absolute_path_logo{background-image:url(/phoenix.png)}
+.relative_path_logo{background-image:url(../images/relative.png)}
+.absolute_url_logo{background-image:url(http://www.phoenixframework.org/absolute.png)}