Skip to content

Commit 274888d

Browse files
committed
完美支持markdown以及高亮
1 parent 8ef1efb commit 274888d

19 files changed

+26
-26
lines changed

app.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ var User = require('./models/User');
1212
//创建app应用 => Node JS http.createServer();
1313
var app = express();
1414

15+
//设置自动转义为false
16+
swig.setDefaults({ autoescape: false });
17+
1518
//设置静态文件托管
1619
app.use('/public', express.static(__dirname + '/public'));
1720

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"cookies": "^0.7.0",
1414
"express": "^4.15.3",
1515
"markdown": "^0.5.0",
16+
"marked": "^0.3.6",
1617
"mongoose": "^4.11.4",
1718
"swig": "^1.4.2"
1819
}

public/js/index.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,4 @@ $(function () {
8282
}
8383
});
8484
})
85-
86-
var content = $('#post-content').html();
87-
console.log(content);
88-
marked.setOptions({
89-
highlight: function (code) {
90-
return hljs.highlightAuto(code).value;
91-
}
92-
});
93-
94-
var convert = marked((content.replace(/&gt;/g,'>')).replace(/&lt;/g, '<'));
95-
console.log(convert);
96-
$('#post-content').html(convert);
97-
})
85+
})

routers/admin.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ router.post('/content/add', function (req, res) {
168168
})
169169
}
170170

171+
console.log(req.body.content);
172+
171173
//保存数据到数据库
172174
new Content({
173175
category: req.body.category,

routers/main.js

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
var express = require('express');
22
var router = express.Router();
33
var Category = require('../models/Category');
4-
var Content = require('../models/Contents')
4+
var Content = require('../models/Contents');
5+
var marked = require('marked');
56

67
var data;
78

@@ -65,8 +66,18 @@ router.get('/view',function (req, res) {
6566

6667
content.views++;
6768
content.save();
68-
69+
70+
//转为markdown
71+
marked.setOptions({
72+
highlight: function (code) {
73+
return require('highlight.js').highlightAuto(code).value;
74+
}
75+
});
76+
77+
data.content.content = marked(data.content.content);
78+
79+
console.log(data.content.content);
6980
res.render('main/view', data);
7081
})
7182
})
72-
module.exports = router;
83+
module.exports = router;

schemas/WiredTiger.turtle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ WiredTiger 2.9.2: (December 23, 2016)
33
WiredTiger version
44
major=2,minor=9,patch=2
55
file:WiredTiger.wt
6-
access_pattern_hint=none,allocation_size=4KB,app_metadata=,block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.249=(addr="018d81e44b453b828e81e422d89b6c8f81e487ceceee808080e2efc0e22fc0",order=249,time=1507552198,size=24576,write_gen=492)),checkpoint_lsn=(7,36608),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)
6+
access_pattern_hint=none,allocation_size=4KB,app_metadata=,block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.375=(addr="018d81e462dcb7328e81e42331ab758f81e4bdec29f5808080e2efc0e22fc0",order=375,time=1507632195,size=24576,write_gen=743)),checkpoint_lsn=(10,67712),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)

schemas/WiredTiger.wt

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
8 KB
Binary file not shown.
159 KB
Binary file not shown.

0 commit comments

Comments
 (0)