From 306964b4ea9bb25583b041b7841e7ad7e3fe0a93 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 15:58:53 -0400 Subject: [PATCH 01/13] chat/dropdown and chat/list component --- public/src/modules/chat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 41d178a413..f77ecf6281 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -7,8 +7,8 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra var newMessage = false; module.prepareDOM = function() { - var chatsToggleEl = $('#chat_dropdown'), - chatsListEl = $('#chat-list'), + var chatsToggleEl = components.get('chat/dropdown'), + chatsListEl = components.get('chat/list'), dropdownEl; // Sync open chats between all user socket sessions From 63be875daaed5857c8b58b935028c624f60a6e5e Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 16:18:53 -0400 Subject: [PATCH 02/13] header/userpicture, header/profilelink, header/username components --- public/src/client/account/edit.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index f7896baa90..eb651ca677 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -87,18 +87,20 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator'], } function updateHeader(picture, username, userslug) { - if (parseInt(ajaxify.data.theirid, 10) !== parseInt(ajaxify.data.yourid, 10)) { - return; - } + require(['components'], function(components) { + if (parseInt(ajaxify.data.theirid, 10) !== parseInt(ajaxify.data.yourid, 10)) { + return; + } - if (picture) { - $('#user-header-picture').attr('src', picture); - } + if (picture) { + components.get('header/userpicture').attr('src', picture); + } - if (username && userslug) { - $('#user-profile-link').attr('href', config.relative_path + '/user/' + userslug); - $('#user-header-name').text(username); - } + if (username && userslug) { + components.get('header/profilelink').attr('href', config.relative_path + '/user/' + userslug); + components.get('header/username').text(username); + } + }); } function handleImageChange() { From a663f95669d9bfa286a75b9626fd273cdfee91b9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 16:32:32 -0400 Subject: [PATCH 03/13] chats.loadChats() --- public/src/modules/chat.js | 91 ++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index f77ecf6281..4c934b19b8 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -8,8 +8,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra module.prepareDOM = function() { var chatsToggleEl = components.get('chat/dropdown'), - chatsListEl = components.get('chat/list'), - dropdownEl; + chatsListEl = components.get('chat/list'); // Sync open chats between all user socket sessions module.sync(); @@ -19,46 +18,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra return; } - socket.emit('modules.chats.getRecentChats', {after: 0}, function(err, chats) { - if (err) { - return app.alertError(err.message); - } - chats = chats.users; - var userObj; - - chatsListEl.empty(); - - if (!chats.length) { - translator.translate('[[modules:chat.no_active]]', function(str) { - $('
  • ') - .addClass('no_active') - .html('' + str + '') - .appendTo(chatsListEl); - }); - return; - } - - for(var x = 0; x') - .attr('data-uid', userObj.uid) - .html(''+ - '' + - ' ' + - userObj.username + '') - .appendTo(chatsListEl); - - (function(userObj) { - dropdownEl.click(function() { - if (!ajaxify.currentPage.match(/^chats\//)) { - app.openChat(userObj.username, userObj.uid); - } else { - ajaxify.go('chats/' + utils.slugify(userObj.username)); - } - }); - })(userObj); - } - }); + module.loadChats(chatsListEl); }); socket.on('event:chats.receive', function(data) { @@ -139,7 +99,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra username: chatObj.options.title, uid: chatObj.options.touid, new: chatObj.element.hasClass('new') - } + }; }); callback(null, chats); @@ -170,6 +130,51 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra }); }; + module.loadChats = function(chatsListEl) { + var dropdownEl; + + socket.emit('modules.chats.getRecentChats', {after: 0}, function(err, chats) { + if (err) { + return app.alertError(err.message); + } + chats = chats.users; + var userObj; + + chatsListEl.empty(); + + if (!chats.length) { + translator.translate('[[modules:chat.no_active]]', function(str) { + $('
  • ') + .addClass('no_active') + .html('' + str + '') + .appendTo(chatsListEl); + }); + return; + } + + for(var x = 0; x') + .attr('data-uid', userObj.uid) + .html(''+ + '' + + ' ' + + userObj.username + '') + .appendTo(chatsListEl); + + (function(userObj) { + dropdownEl.click(function() { + if (!ajaxify.currentPage.match(/^chats\//)) { + app.openChat(userObj.username, userObj.uid); + } else { + ajaxify.go('chats/' + utils.slugify(userObj.username)); + } + }); + })(userObj); + } + }); + }; + module.bringModalToTop = function(chatModal) { var topZ = 0; From 2301362f59bde60a84049b49128eb592b15a2ffd Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 17:12:34 -0400 Subject: [PATCH 04/13] component="header/usercontrol"; also fixes user status bug --- public/src/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 8aeb81ea17..8ecc3659ae 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -487,13 +487,13 @@ app.cacheBuster = null; }; function handleStatusChange() { - $('#user-control-list .user-status').off('click').on('click', function(e) { + $('[component="header/usercontrol"] [data-status]').off('click').on('click', function(e) { var status = $(this).attr('data-status'); socket.emit('user.setStatus', status, function(err, data) { if(err) { return app.alertError(err.message); } - $('#logged-in-menu #user_label #user-profile-link>i').attr('class', 'fa fa-circle status ' + status); + $('[component="user/status"]').attr('class', 'fa fa-circle status ' + status); app.user.status = status; }); e.preventDefault(); From a44f467ebcd1089731ea115b36a8547db1f88d09 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 17:52:36 -0400 Subject: [PATCH 05/13] Notifications.loadNotifications() --- public/src/modules/notifications.js | 42 ++++++++++++++++------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index bf4313b066..5ffbb1de93 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -17,25 +17,7 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) { return; } - socket.emit('notifications.get', null, function(err, data) { - if (err) { - return app.alertError(err.message); - } - - var notifs = data.unread.concat(data.read).sort(function(a, b) { - return parseInt(a.datetime, 10) > parseInt(b.datetime, 10) ? -1 : 1; - }); - - translator.toggleTimeagoShorthand(); - for(var i=0; i parseInt(b.datetime, 10) ? -1 : 1; + }); + + translator.toggleTimeagoShorthand(); + for(var i=0; i Date: Wed, 26 Aug 2015 17:53:23 -0400 Subject: [PATCH 06/13] nbb 0.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41ece32b77..5a9e5d650e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "0.7.3", + "version": "0.7.4", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 1947a4aea6de6c63661b15cfc25a3d5f8e7ae1ca Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 17:58:35 -0400 Subject: [PATCH 07/13] vanilla 3.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a9e5d650e..333b5e4475 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.52", "nodebb-theme-persona": "2.0.28", - "nodebb-theme-vanilla": "3.0.17", + "nodebb-theme-vanilla": "3.1.0", "nodebb-widget-essentials": "1.0.5", "npm": "^2.1.4", "passport": "^0.3.0", From e9a42cdecb0c6c96331cce1275dd0a99b1502375 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 11:48:08 -0400 Subject: [PATCH 08/13] fixed notifications on deskto --- public/src/modules/notifications.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index 5ffbb1de93..d7d6cf79b1 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -17,7 +17,7 @@ define('notifications', ['sounds', 'translator'], function(sound, translator) { return; } - Notifications.loadNotifications(); + Notifications.loadNotifications(notifList); }); notifList.on('click', '[data-nid]', function() { From b19120f82298f485bf3999c6a6a451da4497bed3 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 12:20:45 -0400 Subject: [PATCH 09/13] user/logout componen --- public/src/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/app.js b/public/src/app.js index 8ecc3659ae..6fe793ed15 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -553,7 +553,7 @@ app.cacheBuster = null; handleNewTopic(); - $('#logout-link').on('click', app.logout); + components.get('user/logout').on('click', app.logout); Visibility.change(function(e, state){ if (state === 'visible') { From 54d996ca6abce6f3802b47202c5de538145211b8 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 12:24:58 -0400 Subject: [PATCH 10/13] fixed user/logout component + vanilla 3.1.2 --- package.json | 2 +- public/src/app.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 333b5e4475..50b7d2cf83 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.52", "nodebb-theme-persona": "2.0.28", - "nodebb-theme-vanilla": "3.1.0", + "nodebb-theme-vanilla": "3.1.2", "nodebb-widget-essentials": "1.0.5", "npm": "^2.1.4", "passport": "^0.3.0", diff --git a/public/src/app.js b/public/src/app.js index 6fe793ed15..11b82a51e0 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -553,7 +553,9 @@ app.cacheBuster = null; handleNewTopic(); - components.get('user/logout').on('click', app.logout); + require(['components'], function(components) { + components.get('user/logout').on('click', app.logout); + }); Visibility.change(function(e, state){ if (state === 'visible') { From b5c7a34aa5f6d4a8249512997cb862a727fddef2 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 12:34:44 -0400 Subject: [PATCH 11/13] persona 2.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50b7d2cf83..1cd5fc2a6e 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "nodebb-plugin-spam-be-gone": "0.4.1", "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.52", - "nodebb-theme-persona": "2.0.28", + "nodebb-theme-persona": "2.1.1", "nodebb-theme-vanilla": "3.1.2", "nodebb-widget-essentials": "1.0.5", "npm": "^2.1.4", From d923fa39970aa3dbf52eeaeb70e449ee40680f89 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 12:46:06 -0400 Subject: [PATCH 12/13] up'd persona --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1cd5fc2a6e..94e7a329a7 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "nodebb-plugin-spam-be-gone": "0.4.1", "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.52", - "nodebb-theme-persona": "2.1.1", + "nodebb-theme-persona": "2.1.2", "nodebb-theme-vanilla": "3.1.2", "nodebb-widget-essentials": "1.0.5", "npm": "^2.1.4", From 12015c17288c001231f794a95c0c6284b55c4b8a Mon Sep 17 00:00:00 2001 From: psychobunny Date: Thu, 27 Aug 2015 13:19:04 -0400 Subject: [PATCH 13/13] persona 2.1.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94e7a329a7..5eb9f294b1 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "nodebb-plugin-spam-be-gone": "0.4.1", "nodebb-rewards-essentials": "0.0.3", "nodebb-theme-lavender": "1.0.52", - "nodebb-theme-persona": "2.1.2", + "nodebb-theme-persona": "2.1.4", "nodebb-theme-vanilla": "3.1.2", "nodebb-widget-essentials": "1.0.5", "npm": "^2.1.4",