Skip to content

Commit 137d406

Browse files
polaris1119polaris1119
committed
使用 prism 高亮
1 parent bfeccf2 commit 137d406

File tree

5 files changed

+25
-22
lines changed

5 files changed

+25
-22
lines changed

‎static/js/articles.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
SG.Articles.prototype = new SG.Publisher();
55
SG.Articles.prototype.parseContent = function(selector) {
66
var markdownString = selector.text();
7-
// 配置 marked 语法高亮
8-
marked = SG.markSetting();
7+
marked = SG.markSettingNoHightlight();
98

109
var contentHtml = marked(markdownString);
1110
contentHtml = SG.replaceCodeChar(contentHtml);

‎static/js/common.js

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ SG.markSettingNoHightlight = function() {
134134

135135
// 替换 `` 代码块中的 "<>& 等字符
136136
SG.replaceCodeChar = function(code) {
137+
code = code.replace(/<code class="lang-/g, '<code class="language-');
137138
return code.replace(/<code>.*<\/code>/g, function(matched, index, origin) {
138139
return SG.replaceSpecialChar(matched);
139140
});

‎static/js/topics.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
SG.Topics.prototype = new SG.Publisher();
1818
SG.Topics.prototype.parseContent = function(selector) {
1919
// 配置 marked 语法高亮
20-
marked = SG.markSetting();
20+
marked = SG.markSettingNoHightlight();
2121

2222
selector.each(function() {
2323
var markdownString = $(this).text();

‎template/articles/detail.html

+13-16
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ <h1 id="title" data-id="{{.article.Id}}">
183183
<link href="{{.article.Css}}" media="screen" rel="stylesheet" type="text/css">
184184
{{end}}
185185
{{if .article.IsSelf}}
186-
<link href="/static/css/prism.css" media="screen" rel="stylesheet" type="text/css">
186+
<link href="https://cdn.bootcss.com/prism/9000.0.1/themes/prism-okaidia.min.css" rel="stylesheet">
187187
{{end}}
188188
<link href="/static/css/jquery.atwho.min.css" media="screen" rel="stylesheet" type="text/css">
189189
<style type="text/css">
@@ -198,8 +198,8 @@ <h1 id="title" data-id="{{.article.Id}}">
198198
{{define "js"}}
199199
<script type="text/javascript" src="//cdn.ckeditor.com/4.6.2/standard-all/ckeditor.js"></script>
200200
<script type="text/javascript" src="/static/js/libs/jquery.autogrowtextarea.min.js"></script>
201-
<script src="https://cdn.bootcss.com/marked/0.3.6/marked.min.js"></script>
202201
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
202+
<script src="https://cdn.bootcss.com/marked/0.3.6/marked.min.js"></script>
203203
<script type="text/javascript" src="/static/js/libs/jquery.caret.min.js"></script>
204204
<script type="text/javascript" src="/static/js/libs/jquery.atwho.min.js"></script>
205205
<script type="text/javascript" src="/static/js/libs/emojify.min.js"></script>
@@ -209,15 +209,10 @@ <h1 id="title" data-id="{{.article.Id}}">
209209
<script type="text/javascript" src="/static/js/libs/plupload.full.min.js"></script>
210210
<script type="text/javascript" src="/static/js/comment.js?v=1.25"></script>
211211
<script type="text/javascript" src="/static/js/puploader.js?v=1.1"></script>
212-
{{if .article.IsSelf}}
213-
<script type="text/javascript">
214-
$('code[class*="language-"]').parent('pre').addClass('line-numbers');
215-
</script>
216-
<script type="text/javascript" src="/static/js/prism.js"></script>
217-
{{end}}
218212
{{if .article.Markdown}}
219213
<script type="text/javascript" src="/static/js/articles.js"></script>
220214
{{end}}
215+
221216
<script type="text/javascript">
222217
// 需要加载的侧边栏
223218
SG.SIDE_BARS = [
@@ -254,6 +249,16 @@ <h1 id="title" data-id="{{.article.Id}}">
254249
}
255250
});
256251
</script>
252+
{{if .article.IsSelf}}
253+
<script type="text/javascript">
254+
$('code[class*="language-"]').parent('pre').addClass('line-numbers');
255+
</script>
256+
<!-- <script type="text/javascript" src="/static/js/prism.js"></script> -->
257+
<script src="https://cdn.bootcss.com/prism/9000.0.1/prism.min.js"></script>
258+
<script src="https://cdn.bootcss.com/prism/9000.0.1/components/prism-go.min.js"></script>
259+
<script src="https://cdn.bootcss.com/prism/9000.0.1/plugins/line-numbers/prism-line-numbers.min.js"></script>
260+
{{end}}
261+
257262
<script type="text/javascript" src="/static/ckeditor/config.js"></script>
258263
<script type="text/javascript">
259264
$(function(){
@@ -346,12 +351,4 @@ <h1 id="title" data-id="{{.article.Id}}">
346351
{{end}}
347352
{{end}}
348353

349-
<script>
350-
var baiduImagePlus = {
351-
noLogo:true,
352-
unionId:'u2368846',
353-
formList:[{formId:10}]
354-
};
355-
</script>
356-
<script src="//cpro.baidustatic.com/cpro/ui/i.js"></script>
357354
{{end}}

‎template/topics/detail.html

+9-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,10 @@ <h1>
123123
</div>
124124
{{end}}
125125
{{define "css"}}
126-
<link href="/static/css/highlight/default.css" media="screen" rel="stylesheet" type="text/css">
127126
<link href="/static/css/jquery.atwho.min.css" media="screen" rel="stylesheet" type="text/css">
128127
<link href="/static/css/table.css" media="screen" rel="stylesheet" type="text/css">
128+
<link href="https://cdn.bootcss.com/prism/9000.0.1/themes/prism-okaidia.min.css" rel="stylesheet">
129+
<link href="https://cdn.bootcss.com/prism/9000.0.1/plugins/line-numbers/prism-line-numbers.min.css" rel="stylesheet">
129130
<style type="text/css">
130131
.sb-author .sb-content .avatar {margin: 0 10px 10px;}
131132
.edit-info {color: #3c763d;background-color: #dff0d8;border-color: #d6e9c6; margin:0 10px;}
@@ -135,14 +136,14 @@ <h1>
135136
{{end}}
136137
{{define "js"}}
137138
<script type="text/javascript" src="/static/js/libs/jquery.autogrowtextarea.min.js"></script>
139+
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
138140
<script type="text/javascript" src="/static/js/libs/marked.min.js"></script>
139-
<script type="text/javascript" src="/static/js/libs/highlight.min.js"></script>
140141
<script type="text/javascript" src="/static/js/libs/jquery.caret.min.js"></script>
141142
<script type="text/javascript" src="/static/js/libs/jquery.atwho.min.js"></script>
142143
<script type="text/javascript" src="/static/js/libs/emojify.min.js"></script>
143144
<script type="text/javascript" src="/static/js/libs/emojis.js"></script>
144145
<script type="text/javascript" src="/static/js/libs/plupload.full.min.js"></script>
145-
<script type="text/javascript" src="/static/js/topics.js?v=1.4"></script>
146+
<script type="text/javascript" src="/static/js/topics.js?v=1.5"></script>
146147
<script type="text/javascript" src="/static/js/comment.js?v=1.26"></script>
147148
<script type="text/javascript" src="/static/js/puploader.js?v=1.2"></script>
148149
<script type="text/javascript">
@@ -160,6 +161,8 @@ <h1>
160161
$(function(){
161162
new SG.Topics().parseContent($('.page .content'));
162163

164+
$('code[class*="language-"]').parent('pre').addClass('line-numbers');
165+
163166
// 文本框自动伸缩
164167
$('.need-autogrow').autoGrow();
165168

@@ -190,6 +193,9 @@ <h1>
190193
});
191194
});
192195
</script>
196+
<script src="https://cdn.bootcss.com/prism/9000.0.1/prism.min.js"></script>
197+
<script src="https://cdn.bootcss.com/prism/9000.0.1/components/prism-go.min.js"></script>
198+
<script src="https://cdn.bootcss.com/prism/9000.0.1/plugins/line-numbers/prism-line-numbers.min.js"></script>
193199

194200
{{if .pos_ad.right1}}
195201
{{if eq .pos_ad.right1.AdType 1}}

0 commit comments

Comments
 (0)