Merge branch 'develop'

This commit is contained in:
Estevão Soares dos Santos 2015-05-13 22:38:32 +01:00
commit 7c7f49e8de
4 changed files with 5 additions and 1 deletions

View File

@ -222,6 +222,7 @@ Showdown.converter = function (converter_options) {
// Iterate over each plugin // Iterate over each plugin
Showdown.forEach(converter_options.extensions, function (plugin) { Showdown.forEach(converter_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') {
@ -244,7 +245,7 @@ Showdown.converter = function (converter_options) {
} }
}); });
} else { } else {
throw "Extension '" + plugin + "' could not be loaded. It was either not found or is not a valid extension."; throw "Extension '" + pluginName + "' could not be loaded. It was either not found or is not a valid extension.";
} }
}); });
} }

View File

@ -0,0 +1 @@
<p>2015-10-04</p>

View File

@ -0,0 +1 @@
2015-10-04

View File

@ -54,6 +54,7 @@ var runTestsInDir = function(dir, converter) {
describe('Markdown', function() { describe('Markdown', function() {
var converter = new showdown.converter(); var converter = new showdown.converter();
runTestsInDir('test/cases', converter); runTestsInDir('test/cases', converter);
runTestsInDir('test/issues', converter);
}); });