Autoloader: Fixed and improved callbacks

plugins/autoloader/prism-autoloader.js

@@ -152,6 +152,13 @@
 		"yml": "yaml"
 	}/*]*/;
 
+	/**
+	 * @typedef LangDataItem
+	 * @property {{ success: function, error: function }[]} callbacks
+	 * @property {boolean} [error]
+	 * @property {boolean} [loading]
+	 */
+	/** @type {Object<string, LangDataItem>} */
 	var lang_data = {};
 
 	var ignored_language = 'none';
@@ -215,11 +222,6 @@
 			lang = lang_aliases[lang];
 		}
 
-		var data = lang_data[lang];
-		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') {
@@ -281,20 +283,14 @@
 		var load = function () {
 			var data = lang_data[lang];
 			if (!data) {
-				data = lang_data[lang] = {};
-			}
-			if (success) {
-				if (!data.success_callbacks) {
-					data.success_callbacks = [];
-				}
-				data.success_callbacks.push(success);
-			}
-			if (error) {
-				if (!data.error_callbacks) {
-					data.error_callbacks = [];
-				}
-				data.error_callbacks.push(error);
+				data = lang_data[lang] = {
+					callbacks: []
+				};
 			}
+			data.callbacks.push({
+				success: success,
+				error: error
+			});
 
 			if (!force && Prism.languages[lang]) {
 				languageSuccess(lang);
@@ -328,10 +324,14 @@
 	 * @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) {
-				f(lang);
-			});
+		if (lang_data[lang] ) {
+			var callbacks = lang_data[lang].callbacks;
+			while (callbacks.length) {
+				var callback = callbacks.shift().success;
+				if (callback) {
+					callback();
+				}
+			}
 		}
 	};
 
@@ -340,10 +340,14 @@
 	 * @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) {
-				f(lang);
-			});
+		if (lang_data[lang]) {
+			var callbacks = lang_data[lang].callbacks;
+			while (callbacks.length) {
+				var callback = callbacks.shift().error;
+				if (callback) {
+					callback();
+				}
+			}
 		}
 	};