mirror of
https://github.com/showdownjs/showdown.git
synced 2024-03-22 13:30:55 +08:00
Merge branch 'master' into develop
This commit is contained in:
Estevao Soares dos Santos
commit
7664beae70
36
CHANGELOG.md
36
CHANGELOG.md
|
|
@ -1,3 +1,39 @@
|
|||
|
||||
# [1.9.0](https://github.com/showdownjs/showdown/compare/1.8.7...1.9.0) (2018-11-10)
|
||||
|
||||
Version 1.9.0 introduces a new feature, the Markdown to HTML converter. This feature is still experimental and is a partial backport of the new Reverse Converter planned for version 2.0.
|
||||
### Bug Fixes
|
||||
|
||||
* **italicsAndBold:** fix issue with consecutive spans ([#608](https://github.com/showdownjs/showdown/issues/608)) ([5c0d67e](https://github.com/showdownjs/showdown/commit/5c0d67e)), closes [#544](https://github.com/showdownjs/showdown/issues/544)
|
||||
* **underline:** fix issue with consecutive spans ([81edc70](https://github.com/showdownjs/showdown/commit/81edc70))
|
||||
|
||||
### Features
|
||||
|
||||
* **converter.makeMarkdown:** [EXPERIMENTAL] add an HTML to MD converter ([e4b0e69](https://github.com/showdownjs/showdown/commit/e4b0e69)), closes [#388](https://github.com/showdownjs/showdown/issues/388) [#233](https://github.com/showdownjs/showdown/issues/233)
|
||||
|
||||
<a name="1.8.7"></a>
|
||||
# [1.8.7](https://github.com/showdownjs/showdown/compare/1.8.6...1.8.7) (2018-10-16)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **emojis:** fix emoji excessive size ([4aca41c](https://github.com/showdownjs/showdown/commit/4aca41c))
|
||||
* **gfm-codeblocks:** add support for spaces before language declaration ([24bf7b1](https://github.com/showdownjs/showdown/commit/24bf7b1)), closes [#569](https://github.com/showdownjs/showdown/issues/569)
|
||||
leading space no longer breaks gfm codeblocks ([828c32f](https://github.com/showdownjs/showdown/commit/828c32f)), closes [#523](https://github.com/showdownjs/showdown/issues/523)
|
||||
|
||||
* **images:** fix js error when using image references ([980e702](https://github.com/showdownjs/showdown/commit/980e702)), closes [#585](https://github.com/showdownjs/showdown/issues/585)
|
||||
* **literalMidWordAsterisks:** now parses single characters enclosed by * correctly ([fe70e45](https://github.com/showdownjs/showdown/commit/fe70e45)), closes [#478](https://github.com/showdownjs/showdown/issues/478)
|
||||
* **mentions:** allow for usernames with dot, underscore and dash ([dfeb1e2](https://github.com/showdownjs/showdown/commit/dfeb1e2)), closes [#574](https://github.com/showdownjs/showdown/issues/574)
|
||||
* **nbsp:** fix replacing of nbsp with regular spaces ([8bc1f42](https://github.com/showdownjs/showdown/commit/8bc1f42))
|
||||
|
||||
<a name="1.8.6"></a>
|
||||
# [1.8.6](https://github.com/showdownjs/showdown/compare/1.8.5...1.8.6) (2017-12-22)
|
||||
|
||||
### Features
|
||||
|
||||
* **splitAdjacentBlockquotes:** add option to split adjacent blockquote blocks ([da328f2](https://github.com/showdownjs/showdown/commit/da328f2)), closes [#477](https://github.com/showdownjs/showdown/issues/477)
|
||||
|
||||
|
||||
|
||||
<a name="1.8.5"></a>
|
||||
# [1.8.5](https://github.com/showdownjs/showdown/compare/1.8.4...1.8.5) (2017-12-10)
|
||||
|
||||
|
|
|
|||
12
README.md
12
README.md
|
|
@ -26,7 +26,7 @@ If you like our work and find our library useful, please donate through [patreon
|
|||
## License
|
||||
|
||||
ShowdownJS v 2.0 is release under the MIT version.
|
||||
Previous versions are release under GPL 2.0
|
||||
Previous versions are release under BSD.
|
||||
|
||||
## Who uses Showdown (or a fork)
|
||||
|
||||
|
|
@ -61,9 +61,9 @@ The NuGet Packages can be [found here](https://www.nuget.org/packages/showdownjs
|
|||
|
||||
You can also use one of several CDNs available:
|
||||
|
||||
* github CDN
|
||||
* jsDelivr
|
||||
|
||||
https://cdn.rawgit.com/showdownjs/showdown/<version tag>/dist/showdown.min.js
|
||||
https://cdn.jsdelivr.net/npm/showdown@<version tag>/dist/showdown.min.js
|
||||
|
||||
* cdnjs
|
||||
|
||||
|
|
@ -310,7 +310,7 @@ var defaultOptions = showdown.getDefaultOptions();
|
|||
by 4 spaces for them to be nested, effectively reverting to the old behavior where 2 or 3 spaces were enough.
|
||||
**(since v1.5.0)**
|
||||
|
||||
* **simpleLineBreaks**: (boolean) [default false] Parses line breaks as <br>, without
|
||||
* **simpleLineBreaks**: (boolean) [default false] Parses line breaks as `<br>`, without
|
||||
needing 2 spaces at the end of the line **(since v1.5.1)**
|
||||
|
||||
```md
|
||||
|
|
@ -404,6 +404,10 @@ If you're using TypeScript you maybe want to use the types from [DefinitelyTyped
|
|||
|
||||
Integration with SystemJS can be obtained via the third party ["system-md" plugin](https://github.com/guybedford/system-md).
|
||||
|
||||
## Integration with VueJS
|
||||
|
||||
To use ShowdownJS as a Vue component quickly, you can check [vue-showdown](https://vue-showdown.js.org/).
|
||||
|
||||
## XSS vulnerability
|
||||
|
||||
Showdown doesn't sanitize the input. This is by design since markdown relies on it to allow certain features to be correctly parsed into HTML.
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@
|
|||
// to external links. Hash links (#) open in same page
|
||||
if (options.openLinksInNewWindow && !/^#/.test(url)) {
|
||||
// escaped _
|
||||
target = ' target="¨E95Eblank"';
|
||||
target = ' rel="noopener noreferrer" target="¨E95Eblank"';
|
||||
}
|
||||
|
||||
// Text can be a markdown element, so we run through the appropriate parsers
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<p>My <a href="http://example.com" target="_blank">link</a> is <em>important</em></p>
|
||||
<p>My <a href="http://example.com" target="_blank">link</a> is <strong>important</strong></p>
|
||||
<p>My <a href="http://example.com" rel="noopener noreferrer" target="_blank">link</a> is <em>important</em></p>
|
||||
<p>My <a href="http://example.com" rel="noopener noreferrer" target="_blank">link</a> is <strong>important</strong></p>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<p><a href="www.google.com" target="_blank">foo</a></p>
|
||||
<p>a link <a href="http://www.google.com" target="_blank">http://www.google.com</a></p>
|
||||
<p><a href="www.google.com" rel="noopener noreferrer" target="_blank">foo</a></p>
|
||||
<p>a link <a href="http://www.google.com" rel="noopener noreferrer" target="_blank">http://www.google.com</a></p>
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
<p><a href="www.google.com" target="_blank">foo</a></p>
|
||||
<p>a link <a href="http://www.google.com" target="_blank">http://www.google.com</a></p>
|
||||
<p><a href="www.google.com" rel="noopener noreferrer" target="_blank">foo</a></p>
|
||||
<p>a link <a href="http://www.google.com" rel="noopener noreferrer" target="_blank">http://www.google.com</a></p>
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
<p>this is <a href="http://www.google.com" target="_blank">http://www.google.com</a> autolink</p>
|
||||
<p>this is <a href="http://www.google.com" rel="noopener noreferrer" target="_blank">http://www.google.com</a> autolink</p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user