|
@@ -1,4 +1,4 @@
|
|
-;/*! showdown 01-03-2015 */
|
|
|
|
|
|
+;/*! showdown 22-04-2015 */
|
|
(function(){
|
|
(function(){
|
|
/**
|
|
/**
|
|
* Created by Tivie on 06-01-2015.
|
|
* Created by Tivie on 06-01-2015.
|
|
@@ -158,10 +158,19 @@ showdown.Converter = function (converterOptions) {
|
|
|
|
|
|
// Iterate over each plugin
|
|
// Iterate over each plugin
|
|
showdown.helper.forEach(options.extensions, function (plugin) {
|
|
showdown.helper.forEach(options.extensions, function (plugin) {
|
|
|
|
+ var pluginName = plugin;
|
|
|
|
|
|
// Assume it's a bundled plugin if a string is given
|
|
// Assume it's a bundled plugin if a string is given
|
|
if (typeof plugin === 'string') {
|
|
if (typeof plugin === 'string') {
|
|
- plugin = extensions[showdown.helper.stdExtName(plugin)];
|
|
|
|
|
|
+ var tPluginName = showdown.helper.stdExtName(plugin);
|
|
|
|
+
|
|
|
|
+ if (!showdown.helper.isUndefined(showdown.extensions[tPluginName]) && showdown.extensions[tPluginName]) {
|
|
|
|
+ //Trigger some kind of deprecated alert
|
|
|
|
+ plugin = showdown.extensions[tPluginName];
|
|
|
|
+
|
|
|
|
+ } else if (!showdown.helper.isUndefined(extensions[tPluginName])) {
|
|
|
|
+ plugin = extensions[tPluginName];
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (typeof plugin === 'function') {
|
|
if (typeof plugin === 'function') {
|
|
@@ -180,7 +189,11 @@ showdown.Converter = function (converterOptions) {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- throw 'Extension "' + plugin + '" could not be loaded. It was either not found or is not a valid extension.';
|
|
|
|
|
|
+ var errMsg = 'An extension could not be loaded. It was either not found or is not a valid extension.';
|
|
|
|
+ if (typeof pluginName === 'string') {
|
|
|
|
+ errMsg = 'Extension "' + pluginName + '" could not be loaded. It was either not found or is not a valid extension.';
|
|
|
|
+ }
|
|
|
|
+ throw errMsg;
|
|
}
|
|
}
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -247,6 +260,9 @@ showdown.Converter = function (converterOptions) {
|
|
text = text.replace(/~T/g, '~');
|
|
text = text.replace(/~T/g, '~');
|
|
|
|
|
|
// Run output modifiers
|
|
// Run output modifiers
|
|
|
|
+ showdown.helper.forEach(globals.outputModifiers, function (ext) {
|
|
|
|
+ text = showdown.subParser('runExtension')(ext, text);
|
|
|
|
+ });
|
|
text = parsers.outputModifiers(text, options, globals);
|
|
text = parsers.outputModifiers(text, options, globals);
|
|
|
|
|
|
return text;
|
|
return text;
|