mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
Merge branch 'develop'
This commit is contained in:
commit
7c7f49e8de
|
@ -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.";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
1
test/issues/#150.hyphens are getting removed.html
Normal file
1
test/issues/#150.hyphens are getting removed.html
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<p>2015-10-04</p>
|
1
test/issues/#150.hyphens are getting removed.md
Normal file
1
test/issues/#150.hyphens are getting removed.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
2015-10-04
|
|
@ -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);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user