Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/src/forum/category.js

@@ -53,6 +53,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 	}
 
 	Category.onNewTopic = function(data) {
+		$(window).trigger('filter:categories.new_topic', data);
+
 		var html = templates.prepare(templates['category'].blocks['topics']).parse({
 			topics: [data]
 		});
@@ -89,6 +91,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 			$('#topics-container span.timeago').timeago();
 			app.createUserTooltips();
+
+			$(window).trigger('action:categories.new_topic.loaded');
 		});
 	}
 

public/src/templates.js

@@ -281,7 +281,7 @@
 		}
 
 		function makeRegex(block) {
-			return new RegExp("<!--[\\s]*BEGIN " + block + "[\\s]*-->[\\s\\S]*<!--[\\s]*END " + block + "[\\s]*-->", 'g');
+			return new RegExp("<!--[\\s]*BEGIN " + block + "[\\s]*-->([\\s\\S]*?)<!--[\\s]*END " + block + "[\\s]*-->", 'g');
 		}
 
 		function makeConditionalRegex(block) {

public/templates/category.tpl

@@ -44,10 +44,8 @@
 						<a href="../../topic/{topics.slug}" itemprop="url">
 							<meta itemprop="name" content="{topics.title}">
 
-							<span class="topic-title">
-								<strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong>
-								{topics.title}
-							</span>
+							<strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong>
+							<span class="topic-title">{topics.title}</span>
 						</a>
 					</h3>
 

public/templates/popular.tpl

@@ -32,13 +32,8 @@
 
 				<h3>
 					<a href="{relative_path}/topic/{topics.slug}">
-						<span class="topic-title">
-							<strong>
-								<i class="fa {topics.pin-icon}"></i>
-								<i class="fa {topics.lock-icon}"></i>
-							</strong>
-							 {topics.title}
-						</span>
+						<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong>
+						<span class="topic-title">{topics.title}</span>
 					</a>
 				</h3>
 

public/templates/recent.tpl

@@ -33,13 +33,8 @@
 
 				<h3>
 					<a href="{relative_path}/topic/{topics.slug}">
-						<span class="topic-title">
-							<strong>
-								<i class="fa {topics.pin-icon}"></i>
-								<i class="fa {topics.lock-icon}"></i>
-							</strong>
-							 {topics.title}
-						</span>
+						<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong>
+						<span class="topic-title">{topics.title}</span>
 					</a>
 				</h3>
 

public/templates/topic.tpl

@@ -181,6 +181,11 @@
 							<li><a href="#" class="fork_thread"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 							<li class="divider"></li>
 							<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
+							<!-- BEGIN thread_tools -->
+							<li>
+								<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
+							</li>
+							<!-- END thread_tools -->
 						</ul>
 					</div>
 				</div>
@@ -208,6 +213,11 @@
 					<li><a href="#" class="fork_thread"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 					<li class="divider"></li>
 					<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
+					<!-- BEGIN thread_tools -->
+					<li>
+						<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
+					</li>
+					<!-- END thread_tools -->
 				</ul>
 			</div>
 		</div>

public/templates/unread.tpl

@@ -26,13 +26,8 @@
 					</a>
 					<h3>
 						<a href="{relative_path}/topic/{topics.slug}">
-							<span class="topic-title">
-								<strong>
-									<i class="fa {topics.pin-icon}"></i>
-									<i class="fa {topics.lock-icon}"></i>
-								</strong>
-								 {topics.title}
-							</span>
+							<strong><i class="fa {topics.pin-icon}"></i><i class="fa {topics.lock-icon}"></i></strong>
+							<span class="topic-title">{topics.title}</span>
 						</a>
 					</h3>
 

src/topics.js

@@ -780,7 +780,13 @@ var async = require('async'),
 				Topics.getPageCount(tid, current_user, next);
 			}
 
-			async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount], function(err, results) {
+			function getThreadTools(next) {
+				Plugins.fireHook('filter:topic.thread_tools', [], function(err, threadTools) {
+					next(err, threadTools);
+				});
+			}
+
+			async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData, getPageCount, getThreadTools], function(err, results) {
 				if (err) {
 					winston.error('[Topics.getTopicWithPosts] Could not retrieve topic data: ', err.message);
 					return callback(err);
@@ -789,7 +795,8 @@ var async = require('async'),
 				var topicData = results[0],
 					privileges = results[2],
 					categoryData = results[3],
-					pageCount = results[4];
+					pageCount = results[4],
+					threadTools = results[5];
 
 				callback(null, {
 					'topic_name': topicData.title,
@@ -806,6 +813,7 @@ var async = require('async'),
 					'unreplied': parseInt(topicData.postcount, 10) === 1,
 					'topic_id': tid,
 					'expose_tools': privileges.editable ? 1 : 0,
+					'thread_tools': threadTools,
 					'disableSocialButtons': meta.config.disableSocialButtons !== undefined ? parseInt(meta.config.disableSocialButtons, 10) !== 0 : false,
 					'posts': results[1]
 				});