Commit ae4b48123c8b09e2c53a04d4c0cdb05dcd6df38b

Lea Verou 2012-07-23T19:16:50

Fixed entity tooltip

diff --git a/components/prism-markup.js b/components/prism-markup.js
index a56b797..8e9314b 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -66,10 +66,10 @@ else {
 	delete Prism.languages.markup.style;
 }
 
-// Plugin to make entity title show the real entity
+// Plugin to make entity title show the real entity, idea by Roman Komarov
 Prism.hooks.add('wrap', function(env) {
 
-	if (env.token === 'entity') {
+	if (env.type === 'entity') {
 		env.attributes['title'] = env.content.replace(/&/, '&');
 	}
 });
\ No newline at end of file
diff --git a/components/prism-markup.min.js b/components/prism-markup.min.js
index 76abaea..6840234 100644
--- a/components/prism-markup.min.js
+++ b/components/prism-markup.min.js
@@ -1 +1 @@
-Prism.languages.markup={comment:/&lt;!--[\w\W]*?--(>|&gt;)/g,prolog:/&lt;\?.+?\?(>|&gt;)/,doctype:/&lt;!DOCTYPE.+?(>|&gt;)/,script:null,style:null,cdata:/&lt;!\[CDATA\[[\w\W]+]]&gt;/i,tag:{pattern:/(&lt;|<)\/?[\w:-]+\s*[\w\W]*?(>|&gt;)/gi,inside:{tag:{pattern:/^(&lt;|<)\/?[\w:-]+/i,inside:{punctuation:/^(&lt;|<)\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?&gt;|\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&amp;#?[\da-z]{1,8};/gi};Prism.languages.javascript?Prism.languages.markup.script={pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)|(&lt;|<)\/script(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}:delete Prism.languages.markup.script;Prism.languages.css?Prism.languages.markup.style={pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/style(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)|(&lt;|<)\/style(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}:delete Prism.languages.markup.style;Prism.hooks.add("wrap",function(e){e.token==="entity"&&(e.attributes.title=e.content.replace(/&amp;/,"&"))});
\ No newline at end of file
+Prism.languages.markup={comment:/&lt;!--[\w\W]*?--(>|&gt;)/g,prolog:/&lt;\?.+?\?(>|&gt;)/,doctype:/&lt;!DOCTYPE.+?(>|&gt;)/,script:null,style:null,cdata:/&lt;!\[CDATA\[[\w\W]+]]&gt;/i,tag:{pattern:/(&lt;|<)\/?[\w:-]+\s*[\w\W]*?(>|&gt;)/gi,inside:{tag:{pattern:/^(&lt;|<)\/?[\w:-]+/i,inside:{punctuation:/^(&lt;|<)\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(('|")[\w\W]*?(\2)|[^\s>]+)/gi,inside:{punctuation:/=/g}},punctuation:/\/?&gt;|\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&amp;#?[\da-z]{1,8};/gi};Prism.languages.javascript?Prism.languages.markup.script={pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/script(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)script[\w\W]*?(>|&gt;)|(&lt;|<)\/script(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}:delete Prism.languages.markup.script;Prism.languages.css?Prism.languages.markup.style={pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)[\w\W]*?(&lt;|<)\/style(>|&gt;)/ig,inside:{tag:{pattern:/(&lt;|<)style[\w\W]*?(>|&gt;)|(&lt;|<)\/style(>|&gt;)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}:delete Prism.languages.markup.style;Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&amp;/,"&"))});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index b3eef8c..07e58a8 100644
--- a/prism.js
+++ b/prism.js
@@ -382,10 +382,10 @@ else {
 	delete Prism.languages.markup.style;
 }
 
-// Plugin to make entity title show the real entity
+// Plugin to make entity title show the real entity, idea by Roman Komarov
 Prism.hooks.add('wrap', function(env) {
 
-	if (env.token === 'entity') {
+	if (env.type === 'entity') {
 		env.attributes['title'] = env.content.replace(/&amp;/, '&');
 	}
 });
\ No newline at end of file