diff options
| author | Misko Hevery | 2013-03-20 16:24:23 -0700 |
|---|---|---|
| committer | Misko Hevery | 2013-04-02 14:05:06 -0700 |
| commit | 0b6f1ce5f89f47f9302ff1e8cd8f4b92f837c413 (patch) | |
| tree | 8cbc0c86024dd4f97d0aa54e0c9b7df9b0d56b86 /lib | |
| parent | 4bfb66ce0be46d3a0e9da2f80f3e1d0c2b559828 (diff) | |
| download | angular.js-0b6f1ce5f89f47f9302ff1e8cd8f4b92f837c413.tar.bz2 | |
feat(ngAnimate): add support for animation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/showdown/showdown-0.9.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/showdown/showdown-0.9.js b/lib/showdown/showdown-0.9.js index 1bab5b39..200a5ae7 100644 --- a/lib/showdown/showdown-0.9.js +++ b/lib/showdown/showdown-0.9.js @@ -977,9 +977,9 @@ var _EncodeCode = function(text) { var _DoItalicsAndBold = function(text) { - // <strong> must go first: + // ** must go first: text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g, - "<strong>$2</strong>"); + "**$2</strong>"); text = text.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g, "<em>$2</em>"); @@ -1293,4 +1293,4 @@ var escapeCharacters_callback = function(wholeMatch,m1) { return "~E"+charCodeToEscape+"E"; } -} // end of Showdown.converter
\ No newline at end of file +} // end of Showdown.converter |