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

public/src/app.js

@@ -4,7 +4,8 @@ var socket,
 		'username': null,
 		'uid': null,
 		'isFocused': true,
-		'currentRoom': null
+		'currentRoom': null,
+		'widgets': {}
 	};
 
 (function () {

public/src/forum/home.js

@@ -3,23 +3,29 @@
 define(function() {
 	var	home = {};
 
+	$(window).on('action:ajaxify.end', function(ev, data) {
+		if (data.url === '') {
+			socket.removeListener('event:new_topic', home.onNewTopic);
+			socket.removeListener('event:new_post', home.onNewPost);
+		}
+	});
+
+
 	home.init = function() {
 
 		app.enterRoom('home');
 
-		ajaxify.register_events([
+		socket.on('event:new_topic', home.onNewTopic);
-			'event:new_topic',
+		socket.on('event:new_post', home.onNewPost);
-			'event:new_post'
+	};
-		]);
 
-		socket.on('event:new_topic', function(data) {
+	home.onNewTopic = function(data) {
 
-		});
+	};
 
-		socket.on('event:new_post', function(data) {
+	home.onNewPost = function(data) {
 
-		});
+	};
-	}
 
 	return home;
 });

src/posts.js

@@ -329,7 +329,7 @@ var db = require('./database'),
 
 						if(stripTags) {
 							var s = S(content);
-							postData.content = s.stripTags.apply(s, utils.getTagsExcept(['img', 'i'])).s;
+							postData.content = s.stripTags.apply(s, utils.getTagsExcept(['img', 'i', 'p'])).s;
 						} else {
 							postData.content = content;
 						}

src/routes/api.js

@@ -102,8 +102,6 @@ function getRecentPosts(req, res, next) {
 
 module.exports =  function(app, middleware, controllers) {
 	app.namespace('/api', function () {
-		app.all('*', middleware.updateLastOnlineTime, middleware.prepareAPI);
-
 		app.get('/config', controllers.api.getConfig);
 
 		app.get('/user/uid/:uid', middleware.checkGlobalPrivacySettings, controllers.accounts.getUserByUID);

src/routes/index.js

@@ -12,18 +12,11 @@ var nconf = require('nconf'),
 	pluginRoutes = require('./plugins');
 
 
-module.exports = function(app, middleware) {
+/**
-	app.namespace(nconf.get('relative_path'), function() {
+* Every view has an associated API route.
-		adminRoutes(app, middleware, controllers);
+*
-		metaRoutes(app, middleware, controllers);
+*/
-		apiRoutes(app, middleware, controllers);
+function mainRoutes(app, middleware, controllers) {
-		feedRoutes(app, middleware, controllers);
-		pluginRoutes(app, middleware, controllers);
-
-		/**
-		* Every view has an associated API route.
-		*
-		*/
 	/* Main */
 	app.get('/', middleware.buildHeader, controllers.home);
 	app.get('/api/home', controllers.home);
@@ -121,9 +114,22 @@ module.exports = function(app, middleware) {
 
 	app.get('/users/search', middleware.buildHeader, middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
 	app.get('/api/users/search', middleware.checkGlobalPrivacySettings, controllers.users.getUsersForSearch);
+}
+
+
+module.exports = function(app, middleware) {
+	app.namespace(nconf.get('relative_path'), function() {
+		adminRoutes(app, middleware, controllers);
 
 		plugins.ready(function() {
+			app.all('/api/*', middleware.updateLastOnlineTime, middleware.prepareAPI);
 			plugins.fireHook('action:app.load', app, middleware, controllers);
+
+			metaRoutes(app, middleware, controllers);
+			apiRoutes(app, middleware, controllers);
+			feedRoutes(app, middleware, controllers);
+			pluginRoutes(app, middleware, controllers);
+			mainRoutes(app, middleware, controllers);
 		});
 
 		if (process.env.NODE_ENV === 'development') {

src/socket.io/posts.js

@@ -71,10 +71,7 @@ SocketPosts.reply = function(socket, data, callback) {
 				posts: [postData]
 			};
 
-			var rooms = ['recent_posts', 'home', 'topic_' + postData.tid, 'user/' + postData.uid];
+			index.server.sockets.emit('event:new_post', socketData);
-			rooms.forEach(function(room) {
-				index.server.sockets.in(room).emit('event:new_post', socketData);
-			});
 
 			callback();
 		}
@@ -326,4 +323,9 @@ SocketPosts.loadMoreUserPosts = function(socket, data, callback) {
 	posts.getPostsByUid(socket.uid, data.uid, start, end, callback);
 };
 
+SocketPosts.getRecentPosts = function(socket, term, callback) {
+	posts.getRecentPosts(socket.uid, 0, 19, term, callback);
+};
+
+
 module.exports = SocketPosts;

src/socket.io/tools.js

@@ -3,7 +3,7 @@ var winston = require('winston');
 var	SocketTools = {};
 
 SocketTools.log = function(socket, data, callback) {
-	winston.info("captured console.log:", data)
+	//winston.info("captured console.log:", data)
 };
 
 module.exports = SocketTools;

src/socket.io/topics.js

@@ -61,6 +61,9 @@ SocketTopics.post = function(socket, data, callback) {
 			index.server.sockets.in('category_' + data.category_id).emit('event:new_topic', result.topicData);
 			index.server.sockets.in('recent_posts').emit('event:new_topic', result.topicData);
 			index.server.sockets.in('home').emit('event:new_topic', result.topicData);
+			index.server.sockets.in('home').emit('event:new_post', {
+				posts: result.postData
+			});
 			index.server.sockets.in('user/' + socket.uid).emit('event:new_post', {
 				posts: result.postData
 			});