Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactored postTools.toHTML to fire post.parse hook, and removed auto-markdowning

Browse Source 
closed #214
This commit is contained in:
Julian Lam
2013-08-27 12:50:15 -04:00
parent 0243e9c5be
commit abce5fd120
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -35,7 +35,8 @@
"request": "~2.25.0", "request": "~2.25.0",
"reds": "~0.2.4", "reds": "~0.2.4",
"winston": "~0.7.2", "winston": "~0.7.2",
"nodebb-plugin-mentions": "~0.1.0" "nodebb-plugin-mentions": "~0.1.0",
"nodebb-plugin-markdown": "~0.1.0"
}, },
"bugs": { "bugs": {
"url": "https://github.com/designcreateplay/NodeBB/issues" "url": "https://github.com/designcreateplay/NodeBB/issues"

16
src/postTools.js
View File

@@ -94,7 +94,7 @@ var RDB = require('./redis.js'),
PostTools.privileges(pid, uid, function(privileges) { PostTools.privileges(pid, uid, function(privileges) {
if (privileges.editable) { if (privileges.editable) {
plugins.fireHook('filter:save_post_content', content, function(parsedContent) { plugins.fireHook('filter:post.save', content, function(parsedContent) {
content = parsedContent; content = parsedContent;
success(); success();
}); });
@@ -170,15 +170,11 @@ var RDB = require('./redis.js'),
} }
PostTools.toHTML = function(raw, callback) { PostTools.toHTML = function(raw, callback) {
var marked = require('marked'), plugins.fireHook('filter:post.parse', raw, function(parsed) {
cheerio = require('cheerio'); var cheerio = require('cheerio');
marked.setOptions({ if (parsed && parsed.length > 0) {
breaks: true var parsedContentDOM = cheerio.load(parsed);
});
if (raw && raw.length > 0) {
var parsedContentDOM = cheerio.load(marked(raw));
var domain = nconf.get('url'); var domain = nconf.get('url');
parsedContentDOM('a').each(function() { parsedContentDOM('a').each(function() {
@@ -190,11 +186,11 @@ var RDB = require('./redis.js'),
} }
}); });
callback(null, parsedContentDOM.html()); callback(null, parsedContentDOM.html());
} else { } else {
callback(null, '<p></p>'); callback(null, '<p></p>');
} }
});
} }