Commit 03548f7eb974919f20dbd8b46ac8ec82c0e7ed28

Lea Verou 2012-07-27T04:25:21

Made url() highlighting more robust

diff --git a/components/prism-css.js b/components/prism-css.js
index c76207c..c2b551b 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -1,7 +1,7 @@
 Prism.languages.css = {
 	'comment': /\/\*[\w\W]*?\*\//g,
 	'atrule': /@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,
-	'url': /url\((?:'|")?(.+?)(?:'|")?\)/gi,
+	'url': /url\((["']?).*?\1\)/gi,
 	'selector': /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
 	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
 	'string': /("|')(\\?.)*?\1/g,
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index a8b06dc..77f86ff 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((?:'|")?(.+?)(?:'|")?\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:/@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,property:/(\b|\B)[a-z-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 512c55c..9f1cd30 100644
--- a/prism.js
+++ b/prism.js
@@ -285,7 +285,7 @@ if (script) {
 Prism.languages.css = {
 	'comment': /\/\*[\w\W]*?\*\//g,
 	'atrule': /@[\w-]+?(\s+.+)?(?=\s*{|\s*;)/gi,
-	'url': /url\((?:'|")?(.+?)(?:'|")?\)/gi,
+	'url': /url\((["']?).*?\1\)/gi,
 	'selector': /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
 	'property': /(\b|\B)[a-z-]+(?=\s*:)/ig,
 	'string': /("|')(\\?.)*?\1/g,