better regex url match

mklabs · Oct 16, 2011 · ca1f5c9 · ca1f5c9
1 parent 17405d8
commit ca1f5c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/datauri.js b/lib/datauri.js
@@ -22,7 +22,7 @@ exports.cssEach = function cssEach(it) {
   //
   //    #book_go { background: url(../images/embed/book_go.png); }
   //
-  it.content = it.content.replace(/(.+)\{(.+url\(.+\).+)\}/gm, function(w, selector, block) {
+  it.content = it.content.replace(/(.+)\{(.+url\([^)]+\).+)\}/gm, function(w, selector, block) {
 
     var ieholder = [
       '.ie6 :selector, .ie7 :selector {'.replace(/:selector/g, selector.trim()),
@@ -47,7 +47,7 @@ exports.cssDatauri = function cssDatauri(it) {
     mhtml = ['Content-Type: multipart/related; boudary="' + boundary + '"\n\n'];
 
   // deal with datauris, replace inline url() by their base64 equivalent
-  it.content = it.content.replace(/url\((.+)\)/g, function(w, url) {
+  it.content = it.content.replace(/url\(([^)]+)\)/g, function(w, url) {
     var cssfold = file.split('/').slice(0, -1).join('/'),
       imgpath = path.resolve(cssfold, url),
       base64 = helpers.toBase64(imgpath),