summaryrefslogtreecommitdiff
path: root/src/web/app/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-12 02:38:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-12 02:38:47 +0900
commite19899962edfa9005e1f8fdbc56b1c8e7982864c (patch)
tree2d034dbf6cfbce48e01760a09230735dbf5c9841 /src/web/app/common
parent[Client] Use JSON for API requests (diff)
downloadsharkey-e19899962edfa9005e1f8fdbc56b1c8e7982864c.tar.gz
sharkey-e19899962edfa9005e1f8fdbc56b1c8e7982864c.tar.bz2
sharkey-e19899962edfa9005e1f8fdbc56b1c8e7982864c.zip
インラインのコードでもシンタックスハイライトを有効化
Diffstat (limited to 'src/web/app/common')
-rw-r--r--src/web/app/common/scripts/text-compiler.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js
index f47ce0f3c3..62e70463ad 100644
--- a/src/web/app/common/scripts/text-compiler.js
+++ b/src/web/app/common/scripts/text-compiler.js
@@ -31,9 +31,9 @@ module.exports = function(tokens, shouldBreak, shouldEscape) {
case 'hashtag': // TODO
return '<a>' + escape(token.content) + '</a>';
case 'code':
- return '<pre><code>' + token.codeHtml + '</code></pre>';
+ return '<pre><code>' + token.html + '</code></pre>';
case 'inline-code':
- return '<code>' + escape(token.code) + '</code>';
+ return '<code>' + token.html + '</code>';
}
}).join('');