aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2013-04-03 14:35:09 -0700
committerMisko Hevery2013-04-03 14:35:09 -0700
commit6bca9483238df5df81c492c8700d8914c76dc76e (patch)
treefdc4764226f001e30db4df90f268abf38aeb5b1a
parent556f9cc35ef1a4fb3551bd98b2efa9c63c77bb3b (diff)
downloadangular.js-6bca9483238df5df81c492c8700d8914c76dc76e.tar.bz2
chore(revert): Revert accidental change to showdown
Offending SHA: 0b6f1ce5f89f47f9302ff1e8cd8f4b92f837c413
-rw-r--r--lib/showdown/showdown-0.9.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/showdown/showdown-0.9.js b/lib/showdown/showdown-0.9.js
index 200a5ae7..1bab5b39 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) {
- // ** must go first:
+ // <strong> must go first:
text = text.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,
- "**$2</strong>");
+ "<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
+} // end of Showdown.converter \ No newline at end of file