Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 14:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2013-07-22 12:01:33 -04:00
parent 54c75024b5 676765278e
commit 770fb6d33d
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/forum/footer.js
View File

@@ -145,7 +145,6 @@
socket.on('chatMessage', function(data) { socket.on('chatMessage', function(data) {
var username = data.username; var username = data.username;
var fromuid = data.fromuid; var fromuid = data.fromuid;
var message = data.message; var message = data.message;

2
public/src/forum/topic.js
View File

@@ -316,7 +316,7 @@
'event:topic_deleted', 'event:topic_restored', 'event:topic:locked', 'event:topic_deleted', 'event:topic_restored', 'event:topic:locked',
'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned', 'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned',
'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored', 'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored',
'api:posts.favourite', 'chatMessage' 'api:posts.favourite'
]); ]);

2
public/src/modules/chat.js
View File

@@ -35,7 +35,7 @@ define(['taskbar'], function(taskbar) {
taskbar.discard('chat', uuid); taskbar.discard('chat', uuid);
}); });
chatModal.on('click', function(e){ chatModal.on('click', function(e) {
module.bringModalToTop(chatModal); module.bringModalToTop(chatModal);
}); });

4
public/templates/topic.tpl
View File

@@ -60,7 +60,7 @@
</div> </div>
<div class="post-signature">{main_posts.signature}</div> <div class="post-signature">{main_posts.signature}</div>
<div class="profile-block"> <div class="profile-block">
<img class="hidden-desktop" src="{main_posts.picture}?s=10&default=identicon" align="left" /> posted by <strong><a class="" href="/users/{main_posts.userslug}">{main_posts.username}</a></strong> {main_posts.relativeTime} ago <img class="hidden-desktop" src="{main_posts.picture}" align="left" /> posted by <strong><a class="" href="/users/{main_posts.userslug}">{main_posts.username}</a></strong> {main_posts.relativeTime} ago
<span class="{main_posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{main_posts.editorslug}">{main_posts.editorname}</a></strong> {main_posts.relativeEditTime} ago</span> <span class="{main_posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{main_posts.editorslug}">{main_posts.editorname}</a></strong> {main_posts.relativeEditTime} ago</span>
<span class="{main_posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {main_posts.editorname} {main_posts.relativeEditTime} ago"></i></span> <span class="{main_posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {main_posts.editorname} {main_posts.relativeEditTime} ago"></i></span>
<div class="post-buttons visible-phone"> <div class="post-buttons visible-phone">
@@ -100,7 +100,7 @@
<button id="favs_{posts.pid}_{posts.uid}" class="favourite btn-link hidden-phone" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button> <button id="favs_{posts.pid}_{posts.uid}" class="favourite btn-link hidden-phone" title="Favourite"><span class="post_rep_{posts.pid}">{posts.post_rep} </span><i class="{posts.fav_star_class}"></i></button>
<button class="post_reply btn-link" title="Reply"><i class="icon-reply"></i></button> <button class="post_reply btn-link" title="Reply"><i class="icon-reply"></i></button>
</span> </span>
<img class="hidden-desktop" src="{posts.picture}?s=10&default=identicon" align="left" /> posted by <strong><a class="username-field" href="/users/{posts.userslug}">{posts.username}</a></strong> {posts.relativeTime} ago <img class="hidden-desktop" src="{posts.picture}" align="left" /> posted by <strong><a class="username-field" href="/users/{posts.userslug}">{posts.username}</a></strong> {posts.relativeTime} ago
<span class="{posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span> <span class="{posts.edited-class} hidden-phone">| last edited by <strong><a href="/users/{posts.editorslug}">{posts.editorname}</a></strong> {posts.relativeEditTime} ago</span>
<span class="{posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {posts.editorname} {posts.relativeEditTime} ago"></i></span> <span class="{posts.edited-class}"><i class="icon-edit visible-phone" title="edited by {posts.editorname} {posts.relativeEditTime} ago"></i></span>
</div> </div>

1
src/websockets.js
View File

@@ -429,6 +429,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
}); });
socket.on('sendChatMessage', function(data) { socket.on('sendChatMessage', function(data) {
var touid = data.touid; var touid = data.touid;
if(userSockets[touid]) { if(userSockets[touid]) {