Commit 0064ec86ea9061d8b55103b33cc162a4ac40cc44
2015-09-11T07:40:00
Autoloader Plugin: small fixes + code style
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 177 178 179 180
diff --git a/plugins/autoloader/prism-autoloader.js b/plugins/autoloader/prism-autoloader.js
index 9065c11..124e14e 100644
--- a/plugins/autoloader/prism-autoloader.js
+++ b/plugins/autoloader/prism-autoloader.js
@@ -19,7 +19,7 @@
* @param {function=} success
* @param {function=} error
*/
- var script = function(src, success, error) {
+ var script = function (src, success, error) {
var s = document.createElement('script');
s.src = src;
s.async = true;
@@ -35,11 +35,11 @@
};
/**
- *
+ * Returns the path to a grammar, using the language_path and use_minified config keys.
* @param {string} lang
* @returns {string}
*/
- var getLanguagePath = function(lang) {
+ var getLanguagePath = function (lang) {
return config.languages_path +
'prism-' + lang
+ (config.use_minified ? '.min' : '') + '.js'
@@ -51,26 +51,26 @@
* @param {string} lang
* @param {HTMLElement} elt
*/
- var registerElement = function(lang, elt) {
+ var registerElement = function (lang, elt) {
var data = lang_data[lang];
- if(!data) {
+ if (!data) {
data = lang_data[lang] = {};
}
// Look for additional dependencies defined on the <code> or <pre> tags
var deps = elt.getAttribute('data-dependencies');
- if(!deps && elt.parentNode && elt.parentNode.tagName.toLowerCase() === 'pre') {
+ if (!deps && elt.parentNode && elt.parentNode.tagName.toLowerCase() === 'pre') {
deps = elt.parentNode.getAttribute('data-dependencies');
}
- if(deps) {
+ if (deps) {
deps = deps.split(/\s*,\s*/g);
} else {
deps = [];
}
- loadLanguages(deps, function() {
- loadLanguage(lang, function() {
+ loadLanguages(deps, function () {
+ loadLanguage(lang, function () {
Prism.highlightElement(elt);
});
});
@@ -82,21 +82,21 @@
* @param {function=} success
* @param {function=} error
*/
- var loadLanguages = function(langs, success, error) {
- if(typeof langs === 'string') {
+ var loadLanguages = function (langs, success, error) {
+ if (typeof langs === 'string') {
langs = [langs];
}
var i = 0;
var l = langs.length;
- var f = function() {
- if(i<l) {
- loadLanguage(langs[i], function() {
+ var f = function () {
+ if (i < l) {
+ loadLanguage(langs[i], function () {
i++;
f();
- }, function() {
+ }, function () {
error && error(langs[i]);
});
- } else if(i === l) {
+ } else if (i === l) {
success && success(langs);
}
};
@@ -109,37 +109,37 @@
* @param {function=} success
* @param {function=} error
*/
- var loadLanguage = function(lang, success, error) {
- var load = function() {
+ var loadLanguage = function (lang, success, error) {
+ var load = function () {
var force = false;
// Do we want to force reload the grammar?
- if(lang.indexOf('!') > 0) {
+ if (lang.indexOf('!') >= 0) {
force = true;
lang = lang.replace('!', '');
}
var data = lang_data[lang];
- if(!data) {
+ if (!data) {
data = lang_data[lang] = {};
}
- if(success) {
+ if (success) {
if (!data.success_callbacks) {
data.success_callbacks = [];
}
data.success_callbacks.push(success);
}
- if(error) {
+ if (error) {
if (!data.error_callbacks) {
data.error_callbacks = [];
}
data.error_callbacks.push(error);
}
- if(!force && Prism.languages[lang]) {
+ if (!force && Prism.languages[lang]) {
languageSuccess(lang);
- } else if(!force && data.error) {
+ } else if (!force && data.error) {
languageError(lang);
- } else if(force || !data.loading) {
+ } else if (force || !data.loading) {
data.loading = true;
var src = getLanguagePath(lang);
script(src, function () {
@@ -165,9 +165,9 @@
* Runs all success callbacks for this language.
* @param {string} lang
*/
- var languageSuccess = function(lang) {
- if(lang_data[lang] && lang_data[lang].success_callbacks && lang_data[lang].success_callbacks.length) {
- lang_data[lang].success_callbacks.forEach(function(f) {
+ var languageSuccess = function (lang) {
+ if (lang_data[lang] && lang_data[lang].success_callbacks && lang_data[lang].success_callbacks.length) {
+ lang_data[lang].success_callbacks.forEach(function (f) {
f(lang);
});
}
@@ -177,16 +177,16 @@
* Runs all error callbacks for this language.
* @param {string} lang
*/
- var languageError = function(lang) {
- if(lang_data[lang] && lang_data[lang].error_callbacks && lang_data[lang].error_callbacks.length) {
- lang_data[lang].error_callbacks.forEach(function(f) {
+ var languageError = function (lang) {
+ if (lang_data[lang] && lang_data[lang].error_callbacks && lang_data[lang].error_callbacks.length) {
+ lang_data[lang].error_callbacks.forEach(function (f) {
f(lang);
});
}
};
- Prism.hooks.add('complete', function(env) {
- if(env.element && env.language && !env.grammar) {
+ Prism.hooks.add('complete', function (env) {
+ if (env.element && env.language && !env.grammar) {
registerElement(env.language, env.element);
}
});
diff --git a/plugins/autoloader/prism-autoloader.min.js b/plugins/autoloader/prism-autoloader.min.js
index 356dbbb..dd4c43e 100644
--- a/plugins/autoloader/prism-autoloader.min.js
+++ b/plugins/autoloader/prism-autoloader.min.js
@@ -1 +1 @@
-!function(){if("undefined"!=typeof self&&self.Prism&&self.document&&document.createElement){var e={javascript:"clike",actionscript:"javascript",aspnet:"markup",bash:"clike",c:"clike",csharp:"clike",cpp:"c",coffeescript:"javascript","css-extras":"css",d:"clike",dart:"clike",fsharp:"clike",glsl:"clike",go:"clike",groovy:"clike",haml:"ruby",handlebars:"markup",jade:"javascript",java:"clike",less:"css",markdown:"markup",objectivec:"c",php:"clike","php-extras":"php",processing:"clike",qore:["clike"],jsx:["markup","javascript"],ruby:"clike",sass:"css",scss:"css",scala:"java",smarty:"markup",swift:"clike",textile:"markup",twig:"markup",typescript:"javascript",wiki:"markup"},c={},a=Prism.plugins.autoloader={languages_path:"components/",use_minified:!0},s=function(e,c,a){var s=document.createElement("script");s.src=e,s.async=!0,s.onload=function(){document.body.removeChild(s),c&&c()},s.onerror=function(){document.body.removeChild(s),a&&a()},document.body.appendChild(s)},r=function(e){return a.languages_path+"prism-"+e+(a.use_minified?".min":"")+".js"},n=function(e,a){var s=c[e];s||(s=c[e]={});var r=a.getAttribute("data-dependencies");!r&&a.parentNode&&"pre"===a.parentNode.tagName.toLowerCase()&&(r=a.parentNode.getAttribute("data-dependencies")),r=r?r.split(/\s*,\s*/g):[],i(r,function(){t(e,function(){Prism.highlightElement(a)})})},i=function(e,c,a){"string"==typeof e&&(e=[e]);var s=0,r=e.length,n=function(){r>s?t(e[s],function(){s++,n()},function(){a&&a(e[s])}):s===r&&c&&c(e)};n()},t=function(a,n,t){var u=function(){var e=!1;a.indexOf("!")>0&&(e=!0,a=a.replace("!",""));var i=c[a];if(i||(i=c[a]={}),n&&(i.success_callbacks||(i.success_callbacks=[]),i.success_callbacks.push(n)),t&&(i.error_callbacks||(i.error_callbacks=[]),i.error_callbacks.push(t)),!e&&Prism.languages[a])l(a);else if(!e&&i.error)o(a);else if(e||!i.loading){i.loading=!0;var u=r(a);s(u,function(){i.loading=!1,l(a)},function(){i.loading=!1,i.error=!0,o(a)})}},p=e[a];p&&p.length?i(p,u):u()},l=function(e){c[e]&&c[e].success_callbacks&&c[e].success_callbacks.length&&c[e].success_callbacks.forEach(function(c){c(e)})},o=function(e){c[e]&&c[e].error_callbacks&&c[e].error_callbacks.length&&c[e].error_callbacks.forEach(function(c){c(e)})};Prism.hooks.add("complete",function(e){e.element&&e.language&&!e.grammar&&n(e.language,e.element)})}}();
\ No newline at end of file
+!function(){if("undefined"!=typeof self&&self.Prism&&self.document&&document.createElement){var e={javascript:"clike",actionscript:"javascript",aspnet:"markup",bash:"clike",c:"clike",csharp:"clike",cpp:"c",coffeescript:"javascript","css-extras":"css",d:"clike",dart:"clike",fsharp:"clike",glsl:"clike",go:"clike",groovy:"clike",haml:"ruby",handlebars:"markup",jade:"javascript",java:"clike",less:"css",markdown:"markup",objectivec:"c",php:"clike","php-extras":"php",processing:"clike",qore:["clike"],jsx:["markup","javascript"],ruby:"clike",sass:"css",scss:"css",scala:"java",smarty:"markup",swift:"clike",textile:"markup",twig:"markup",typescript:"javascript",wiki:"markup"},c={},a=Prism.plugins.autoloader={languages_path:"components/",use_minified:!0},s=function(e,c,a){var s=document.createElement("script");s.src=e,s.async=!0,s.onload=function(){document.body.removeChild(s),c&&c()},s.onerror=function(){document.body.removeChild(s),a&&a()},document.body.appendChild(s)},r=function(e){return a.languages_path+"prism-"+e+(a.use_minified?".min":"")+".js"},n=function(e,a){var s=c[e];s||(s=c[e]={});var r=a.getAttribute("data-dependencies");!r&&a.parentNode&&"pre"===a.parentNode.tagName.toLowerCase()&&(r=a.parentNode.getAttribute("data-dependencies")),r=r?r.split(/\s*,\s*/g):[],i(r,function(){t(e,function(){Prism.highlightElement(a)})})},i=function(e,c,a){"string"==typeof e&&(e=[e]);var s=0,r=e.length,n=function(){r>s?t(e[s],function(){s++,n()},function(){a&&a(e[s])}):s===r&&c&&c(e)};n()},t=function(a,n,t){var u=function(){var e=!1;a.indexOf("!")>=0&&(e=!0,a=a.replace("!",""));var i=c[a];if(i||(i=c[a]={}),n&&(i.success_callbacks||(i.success_callbacks=[]),i.success_callbacks.push(n)),t&&(i.error_callbacks||(i.error_callbacks=[]),i.error_callbacks.push(t)),!e&&Prism.languages[a])l(a);else if(!e&&i.error)o(a);else if(e||!i.loading){i.loading=!0;var u=r(a);s(u,function(){i.loading=!1,l(a)},function(){i.loading=!1,i.error=!0,o(a)})}},p=e[a];p&&p.length?i(p,u):u()},l=function(e){c[e]&&c[e].success_callbacks&&c[e].success_callbacks.length&&c[e].success_callbacks.forEach(function(c){c(e)})},o=function(e){c[e]&&c[e].error_callbacks&&c[e].error_callbacks.length&&c[e].error_callbacks.forEach(function(c){c(e)})};Prism.hooks.add("complete",function(e){e.element&&e.language&&!e.grammar&&n(e.language,e.element)})}}();
\ No newline at end of file