From 22d954d01f16e468a6438efc076c08ec61f18c2d Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 22 Jul 2013 14:40:52 -0400 Subject: [PATCH 1/3] fixed for broken category view, after topic move --- src/categories.js | 1 + src/user.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/categories.js b/src/categories.js index 165f9e2c3f..6db85d744a 100644 --- a/src/categories.js +++ b/src/categories.js @@ -83,6 +83,7 @@ var RDB = require('./redis.js'), categoryData.moderator_block_class = results[1].length > 0 ? '' : 'none'; categoryData.moderators = results[1]; categoryData.active_users = results[2]; + console.log(results[2]); callback(categoryData); }); } diff --git a/src/user.js b/src/user.js index 25ae8b6f6b..695458072c 100644 --- a/src/user.js +++ b/src/user.js @@ -141,7 +141,7 @@ var utils = require('./../public/src/utils.js'), User.getMultipleUserFields = function(uids, fields, callback) { if(uids.length === 0) { - callback({}); + callback([]); return; } From f0df2289e629113cac15fbf09da5114159a29d12 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Mon, 22 Jul 2013 14:50:34 -0400 Subject: [PATCH 2/3] i keep forgetting console.logs in commits :/ --- src/categories.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/categories.js b/src/categories.js index 6db85d744a..165f9e2c3f 100644 --- a/src/categories.js +++ b/src/categories.js @@ -83,7 +83,6 @@ var RDB = require('./redis.js'), categoryData.moderator_block_class = results[1].length > 0 ? '' : 'none'; categoryData.moderators = results[1]; categoryData.active_users = results[2]; - console.log(results[2]); callback(categoryData); }); } From 712eec08720498c3120743c3e18319ef532849d5 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 22 Jul 2013 15:03:33 -0400 Subject: [PATCH 3/3] re: issue #104, added external link icon to external links --- public/css/style.less | 2 +- src/postTools.js | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/public/css/style.less b/public/css/style.less index 4ea31d8a9d..ffa6357a27 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -389,7 +389,7 @@ body .navbar .nodebb-inline-block { .post-signature { color: #666; - font-size: 12px; + font-size: 12.5px; border-top: 1px solid #ddd; display: inline-block; diff --git a/src/postTools.js b/src/postTools.js index c8a982bbc6..4a00f897b6 100644 --- a/src/postTools.js +++ b/src/postTools.js @@ -147,8 +147,12 @@ var RDB = require('./redis.js'), }); if (md.length > 0) { - var parsedContentDOM = cheerio.load(marked(md)); - parsedContentDOM('a').attr('rel', 'nofollow').attr('target', '_blank'); + var parsedContentDOM = cheerio.load(marked(md)), + anchorText = parsedContentDOM.text(); + parsedContentDOM('a').each(function() { + this.attr('rel', 'nofollow').attr('target', '_blank'); + this.append(' '); + }); html = parsedContentDOM.html(); } else html = '

';