diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index ac96a7d6be..e61aa5264e 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -21,6 +21,13 @@ var ajaxify = {}; ajaxify.go = function(url, callback) { + // leave room and join global + if (current_room != 'global') { + socket.emit('event:enter_room', 'global'); + current_room = 'global'; + } + + var url = url.replace(/\/$/, ""); var tpl_url = (url === '' || url === '/') ? 'home' : url.split('/')[0]; diff --git a/public/src/app.js b/public/src/app.js index 29e60a9ddf..68f4894a43 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -1,7 +1,7 @@ var socket, config, app = {}, - + current_room, API_URL = null; // todo: cleanup,etc @@ -173,6 +173,12 @@ var socket, }; jQuery('document').ready(function() { + if (current_room != 'global') { + socket.emit('event:enter_room', 'global'); + current_room = 'global'; + } + + // On menu click, change "active" state var menuEl = document.querySelector('.nav'), liEls = menuEl.querySelectorAll('li'), diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 57a3025e45..ddfc2c19c2 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -35,6 +35,12 @@ \ No newline at end of file diff --git a/src/posts.js b/src/posts.js index 14b6079cf9..635c199cd1 100644 --- a/src/posts.js +++ b/src/posts.js @@ -14,7 +14,8 @@ var RDB = require('./redis.js'), - Posts.get = function(callback, tid, start, end) { + Posts.get = function(callback, tid, current_user, start, end) { + console.log(current_user); if (start == null) start = 0; if (end == null) end = start + 10; @@ -53,7 +54,7 @@ var RDB = require('./redis.js'), for (var i=0, ii=content.length; i