Commit bdb8fae8449b2031d4025f1e051917e71406264b
2012-07-13T15:11:03
Added hooks system, moved entity tooltips to the Markup language, as a plugin
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
diff --git a/components/prism-core.js b/components/prism-core.js
index 9f09628..7654466 100644
--- a/components/prism-core.js
+++ b/components/prism-core.js
@@ -145,28 +145,52 @@ var _ = self.Prism = {
},
wrap: function(token, content) {
- var tag = 'span',
- classes = ['token', token],
- attributes = {};
+ var env = {
+ token: token,
+ content: content
+ };
- if (token === 'comment') {
- attributes['spellcheck'] = 'true';
- }
+ env.tag = 'span';
+ env.classes = ['token', token];
+ env.attributes = {};
- // Example plugin - Will be removed
- if (token === 'entity') {
- attributes['title'] = content.replace(/&/, '&');
+ if (token === 'comment') {
+ env.attributes['spellcheck'] = 'true';
}
- // TODO Add hook here
+ _.hooks.run('wrap', env);
var attributesSerialized = '';
- for (var name in attributes) {
- attributesSerialized += name + '="' + (attributes[name] || '') + '"';
+ for (var name in env.attributes) {
+ attributesSerialized += name + '="' + (env.attributes[name] || '') + '"';
}
- return '<' + tag + ' class="' + classes.join(' ') + '" ' + attributesSerialized + '>' + content + '</' + tag + '>';
+ return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributesSerialized + '>' + env.content + '</' + env.tag + '>';
+ },
+
+ hooks: {
+ all: {},
+
+ add: function (name, callback) {
+ var hooks = _.hooks.all;
+
+ hooks[name] = hooks[name] || [];
+
+ hooks[name].push(callback);
+ },
+
+ run: function (name, env) {
+ var callbacks = _.hooks.all[name];
+
+ if (!callbacks || !callbacks.length) {
+ return;
+ }
+
+ for (var i=0, callback; callback = callbacks[i++];) {
+ callback(env);
+ }
+ }
}
};
diff --git a/components/prism-markup.js b/components/prism-markup.js
index 6f55fd4..a56b797 100644
--- a/components/prism-markup.js
+++ b/components/prism-markup.js
@@ -64,4 +64,12 @@ if (Prism.languages.css) {
}
else {
delete Prism.languages.markup.style;
-}
\ No newline at end of file
+}
+
+// Plugin to make entity title show the real entity
+Prism.hooks.add('wrap', function(env) {
+
+ if (env.token === 'entity') {
+ env.attributes['title'] = env.content.replace(/&/, '&');
+ }
+});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 402f62b..f3d1481 100644
--- a/prism.js
+++ b/prism.js
@@ -145,28 +145,52 @@ var _ = self.Prism = {
},
wrap: function(token, content) {
- var tag = 'span',
- classes = ['token', token],
- attributes = {};
+ var env = {
+ token: token,
+ content: content
+ };
- if (token === 'comment') {
- attributes['spellcheck'] = 'true';
- }
+ env.tag = 'span';
+ env.classes = ['token', token];
+ env.attributes = {};
- // Example plugin - Will be removed
- if (token === 'entity') {
- attributes['title'] = content.replace(/&/, '&');
+ if (token === 'comment') {
+ env.attributes['spellcheck'] = 'true';
}
- // TODO Add hook here
+ _.hooks.run('wrap', env);
var attributesSerialized = '';
- for (var name in attributes) {
- attributesSerialized += name + '="' + (attributes[name] || '') + '"';
+ for (var name in env.attributes) {
+ attributesSerialized += name + '="' + (env.attributes[name] || '') + '"';
}
- return '<' + tag + ' class="' + classes.join(' ') + '" ' + attributesSerialized + '>' + content + '</' + tag + '>';
+ return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributesSerialized + '>' + env.content + '</' + env.tag + '>';
+ },
+
+ hooks: {
+ all: {},
+
+ add: function (name, callback) {
+ var hooks = _.hooks.all;
+
+ hooks[name] = hooks[name] || [];
+
+ hooks[name].push(callback);
+ },
+
+ run: function (name, env) {
+ var callbacks = _.hooks.all[name];
+
+ if (!callbacks || !callbacks.length) {
+ return;
+ }
+
+ for (var i=0, callback; callback = callbacks[i++];) {
+ callback(env);
+ }
+ }
}
};
@@ -304,4 +328,12 @@ if (Prism.languages.css) {
}
else {
delete Prism.languages.markup.style;
-}
\ No newline at end of file
+}
+
+// Plugin to make entity title show the real entity
+Prism.hooks.add('wrap', function(env) {
+
+ if (env.token === 'entity') {
+ env.attributes['title'] = env.content.replace(/&/, '&');
+ }
+});
\ No newline at end of file