hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
v1.18.x
psychobunny 12 years ago
parent a9672ab9d8 37985cc383
commit 9503aa9a57
9 changed files with 271 additions and 60 deletions
Show Stats Download Patch File Download Diff File

12
public/css/style.less
Unescape Escape View File

@ -733,4 +733,14 @@ body .navbar .nodebb-inline-block {
font-size: 12px; font-size: 12px;
color: red; color: red;
} }
} }
#chat-content {
width:95%;
height:200px;
resize:none;
}
#chat-message-input {
width:95%;
}

4
public/src/ajaxify.js
Unescape Escape View File

@ -48,9 +48,6 @@ var ajaxify = {};
jQuery('#footer, #content').fadeOut(100); jQuery('#footer, #content').fadeOut(100);
// Close the post window if it is open
app.close_post_window();
templates.load_template(function() { templates.load_template(function() {
exec_body_scripts(content); exec_body_scripts(content);
@ -62,6 +59,7 @@ var ajaxify = {};
app.process_page(); app.process_page();
jQuery('#content, #footer').fadeIn(200); jQuery('#content, #footer').fadeIn(200);
app.close_post_window();
}, url, template); }, url, template);
return true; return true;

152
public/src/app.js
Unescape Escape View File

@ -14,6 +14,10 @@ var socket,
config = data; config = data;
socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : ''); socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : '');
var reconnecting = false;
var reconnectTries = 0;
socket.on('event:connect', function(data) { socket.on('event:connect', function(data) {
console.log('connected to nodebb socket: ', data); console.log('connected to nodebb socket: ', data);
}); });
@ -32,15 +36,56 @@ var socket,
contentEl.value = data.post; contentEl.value = data.post;
}); });
socket.on('disconnect', function(data){ socket.on('connect', function(data){
setTimeout(function() { if(reconnecting) {
$('#disconnect-modal').modal('show'); app.alert({
$('#reload-button').on('click',function(){ alert_id: 'connection_alert',
$('#disconnect-modal').modal('hide'); title: 'Connected',
window.location.reload(); message: 'Connection successfull',
type: 'success',
timeout: 5000
}); });
}, 500); reconnecting = false;
}
});
socket.on('disconnect', function(data){
app.alert({
alert_id: 'connection_alert',
title: 'Disconnect',
message: 'You have disconnected from NodeBB, we will try to reconnect!',
type: 'error',
timeout: 5000
});
}); });
socket.on('reconnecting', function(data) {
reconnecting = true;
reconnectTries++;
if(reconnectTries > 4) {
showDisconnectModal();
return;
}
app.alert({
alert_id: 'connection_alert',
title: 'Reconnecting',
message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>',
type: 'notify',
timeout: 5000
});
});
function showDisconnectModal() {
$('#disconnect-modal').modal({
backdrop:'static',
show:true
});
$('#reload-button').on('click',function(){
$('#disconnect-modal').modal('hide');
window.location.reload();
});
}
}, },
async: false async: false
}); });
@ -50,6 +95,17 @@ var socket,
return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"); return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
} }
// Willingly stolen from: http://phpjs.org/functions/strip_tags/
app.strip_tags = function(input, allowed) {
allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
});
}
// use unique alert_id to have multiple alerts visible at a time, use the same alert_id to fade out the current instance // use unique alert_id to have multiple alerts visible at a time, use the same alert_id to fade out the current instance
// type : error, success, info, warning/notify // type : error, success, info, warning/notify
// title = bolded title text // title = bolded title text
@ -57,51 +113,60 @@ var socket,
// timeout default = permanent // timeout default = permanent
// location : notification_window (default) or content // location : notification_window (default) or content
app.alert = function(params) { app.alert = function(params) {
var div = document.createElement('div'),
button = document.createElement('button'),
strong = document.createElement('strong'),
p = document.createElement('p');
var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime()); var alert_id = 'alert_button_' + ((params.alert_id) ? params.alert_id : new Date().getTime());
jQuery('#'+alert_id).fadeOut(500, function() { var alert = $('#'+alert_id);
this.remove();
});
p.innerHTML = params.message;
strong.innerHTML = params.title;
div.className = "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type); if(alert.length > 0) {
alert.find('strong').html(params.title);
div.setAttribute('id', alert_id); alert.find('p').html(params.message);
div.appendChild(button); alert.attr('class', "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type));
div.appendChild(strong);
div.appendChild(p);
button.className = 'close';
button.innerHTML = '&times;';
button.onclick = function(ev) {
div.parentNode.removeChild(div);
} }
else {
if (params.location == null) params.location = 'notification_window'; var div = document.createElement('div'),
button = document.createElement('button'),
strong = document.createElement('strong'),
p = document.createElement('p');
jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100')); p.innerHTML = params.message;
strong.innerHTML = params.title;
if (params.timeout) { div.className = "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type);
setTimeout(function() {
jQuery(div).fadeOut(1000, function() { div.setAttribute('id', alert_id);
this.remove(); div.appendChild(button);
}); div.appendChild(strong);
}, params.timeout) div.appendChild(p);
}
button.className = 'close';
button.innerHTML = '&times;';
button.onclick = function(ev) {
div.parentNode.removeChild(div);
}
if (params.clickfn) { if (params.location == null)
div.onclick = function() { params.location = 'notification_window';
params.clickfn();
jQuery(div).fadeOut(500, function() { jQuery('#'+params.location).prepend(jQuery(div).fadeIn('100'));
this.remove();
}); if (params.timeout) {
setTimeout(function() {
jQuery(div).fadeOut(1000, function() {
this.remove();
});
}, params.timeout)
}
if (params.clickfn) {
div.onclick = function() {
params.clickfn();
jQuery(div).fadeOut(500, function() {
this.remove();
});
}
} }
} }
} }
@ -114,6 +179,7 @@ var socket,
app.open_post_window = function(post_mode, id, title, pid) { app.open_post_window = function(post_mode, id, title, pid) {
submit_post_btn = submit_post_btn || document.getElementById('submit_post_btn'); submit_post_btn = submit_post_btn || document.getElementById('submit_post_btn');
post_title = post_title || document.getElementById('post_title'); post_title = post_title || document.getElementById('post_title');
reply_title = reply_title || document.getElementById('reply_title'); reply_title = reply_title || document.getElementById('reply_title');

2
public/templates/admin/users.tpl
Unescape Escape View File

@ -16,7 +16,7 @@
<!-- BEGIN users --> <!-- BEGIN users -->
<div class="users-box well"> <div class="users-box well">
<a href="/users/{users.username}"> <a href="/users/{users.username}">
<img src="{users.picture}"/> <img src="{users.picture}" class="user-8080-picture"/>
</a> </a>
<br/> <br/>
<a href="/users/{users.username}">{users.username}</a> <a href="/users/{users.username}">{users.username}</a>

1
public/templates/footer.tpl
Unescape Escape View File

@ -81,7 +81,6 @@
} }
}); });
// Post window events // Post window events
var postWindowEl = document.getElementById('post_window'), var postWindowEl = document.getElementById('post_window'),
discardEl = document.getElementById('discard-post'); discardEl = document.getElementById('discard-post');

15
public/templates/header.tpl
Unescape Escape View File

@ -9,6 +9,7 @@
<link href="/vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen"> <link href="/vendor/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="/vendor/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/vendor/fontawesome/css/font-awesome.min.css">
<script type="text/javascript" src="http://code.jquery.com/jquery.js"></script> <script type="text/javascript" src="http://code.jquery.com/jquery.js"></script>
<script type="text/javascript" src="/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js"></script>
<script type="text/javascript" src="/vendor/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="/vendor/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/socket.io/socket.io.js"></script> <script type="text/javascript" src="/socket.io/socket.io.js"></script>
<script type="text/javascript" src="/src/app.js"></script> <script type="text/javascript" src="/src/app.js"></script>
@ -85,13 +86,25 @@
<h3 id="myModalLabel">Socket Disconnect</h3> <h3 id="myModalLabel">Socket Disconnect</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<span>Looks like you disconnected, try reloading the page.</span> <span id="disconnect-text">Looks like you disconnected, try reloading the page.</span>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a id="reload-button" href="/" class="btn btn-primary">Reload</a> <a id="reload-button" href="/" class="btn btn-primary">Reload</a>
</div> </div>
</div> </div>
<div id="chat-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3 id="myModalLabel">Chat with <span id="chat-with-name"></span></h3>
</div>
<div class="modal-body">
<textarea id="chat-content" cols="40" rows="10" readonly></textarea><br/>
<input id="chat-message-input" type="text" name="chat-message" placeholder="type chat message here press enter to send"/><br/>
<button type="button" id="chat-message-send-btn" href="#" class="btn btn-primary">Send</button>
</div>
</div>
<div id="notification_window"></div> <div id="notification_window"></div>
<div class="container" id="content"> <div class="container" id="content">

121
public/templates/topic.tpl
Unescape Escape View File

@ -25,12 +25,12 @@
</a> </a>
<h3><p class="topic-title">{topic_name}</p> <h3><p class="topic-title">{topic_name}</p>
<div class="pull-right hidden-phone" style="margin-right: 10px;"> <div class="pull-right hidden-phone" style="margin-right: 10px;">
<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn edit {main_posts.display_moderator_tools}"><i class="icon-pencil"></i></button> <button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn edit {main_posts.display_moderator_tools}" type="button"><i class="icon-pencil"></i></button>
<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}"><i class="icon-trash"></i></button> <button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}" type="button"><i class="icon-trash"></i></button>
<button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn quote"><i class="icon-quote-left"></i></button> <button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn quote" type="button"><i class="icon-quote-left"></i></button>
<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn"><span class="post_rep_{main_posts.pid}">Favourite {main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button> <button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button"><span class="post_rep_{main_posts.pid}">Favourite {main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button>
<button id="post_reply" class="btn btn-primary btn post_reply">Reply <i class="icon-reply"></i></button> <button id="post_reply" class="btn btn-primary btn post_reply" type="button">Reply <i class="icon-reply"></i></button>
</div> </div>
</h3> </h3>
@ -52,7 +52,7 @@
<!-- END main_posts --> <!-- END main_posts -->
<!-- BEGIN posts --> <!-- BEGIN posts -->
<li class="row post-row" data-pid="{posts.pid}" data-uid="{posts.uid}" data-deleted="{posts.deleted}"> <li class="row post-row" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-deleted="{posts.deleted}">
<div class="span1 profile-image-block visible-desktop"> <div class="span1 profile-image-block visible-desktop">
<!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>--> <!--<i class="icon-spinner icon-spin icon-2x pull-left"></i>-->
<a href="/users/{posts.username}"> <a href="/users/{posts.username}">
@ -66,6 +66,7 @@
<div class="post-signature">{posts.signature}</div> <div class="post-signature">{posts.signature}</div>
<div class="profile-block"> <div class="profile-block">
<span class="post-buttons"> <span class="post-buttons">
<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-phone"><i class="icon-comment"></i></div>
<div id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} hidden-phone"><i class="icon-pencil"></i></div> <div id="ids_{posts.pid}_{posts.uid}" class="edit {posts.display_moderator_tools} hidden-phone"><i class="icon-pencil"></i></div>
<div id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} hidden-phone"><i class="icon-trash"></i></div> <div id="ids_{posts.pid}_{posts.uid}" class="delete {posts.display_moderator_tools} hidden-phone"><i class="icon-trash"></i></div>
<div id="quote_{posts.pid}_{posts.uid}" class="quote hidden-phone"><i class="icon-quote-left"></i></div> <div id="quote_{posts.pid}_{posts.uid}" class="quote hidden-phone"><i class="icon-quote-left"></i></div>
@ -82,9 +83,9 @@
<!-- END posts --> <!-- END posts -->
</ul> </ul>
<hr /> <hr />
<button id="post_reply" class="btn btn-primary btn-large post_reply">Reply</button> <button id="post_reply" class="btn btn-primary btn-large post_reply" type="button">Reply</button>
<div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;"> <div class="btn-group pull-right" id="thread-tools" style="visibility: hidden;">
<button class="btn dropdown-toggle" data-toggle="dropdown">Thread Tools <span class="caret"></span></button> <button class="btn dropdown-toggle" data-toggle="dropdown" type="button">Thread Tools <span class="caret"></span></button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" id="pin_thread"><i class="icon-pushpin"></i> Pin Thread</a></li> <li><a href="#" id="pin_thread"><i class="icon-pushpin"></i> Pin Thread</a></li>
<li><a href="#" id="lock_thread"><i class="icon-lock"></i> Lock Thread</a></li> <li><a href="#" id="lock_thread"><i class="icon-lock"></i> Lock Thread</a></li>
@ -191,6 +192,7 @@
e.preventDefault(); e.preventDefault();
moveThreadModal.modal('show'); moveThreadModal.modal('show');
}, false); }, false);
moveThreadModal.on('shown', function() { moveThreadModal.on('shown', function() {
var loadingEl = document.getElementById('categories-loading'); var loadingEl = document.getElementById('categories-loading');
if (loadingEl) { if (loadingEl) {
@ -291,6 +293,106 @@
} }
}); });
// CHAT, move to chat.js later?
$('.post-container').delegate('.chat', 'click', function(e){
var username = $(this).parents('li').attr('data-username');
var touid = $(this).parents('li').attr('data-uid');
var chatModal = createModalIfDoesntExist(username, touid);
chatModal.show();
bringModalToTop(chatModal);
});
function bringModalToTop(chatModal) {
var topZ = 0;
$('.modal').each(function(){
var thisZ = parseInt($(this).css('zIndex'), 10);
if (thisZ > topZ){
topZ = thisZ;
}
});
chatModal.css('zIndex', topZ+1);
}
function createModalIfDoesntExist(username, touid) {
var chatModal = $('#chat-modal-'+touid);
if(!chatModal.length) {
var chatModal = $('#chat-modal').clone();
chatModal.attr('id','chat-modal-'+touid);
chatModal.appendTo($('body'));
chatModal.draggable({
start:function(){
bringModalToTop(chatModal);
}
});
chatModal.find('#chat-with-name').html(username);
chatModal.find('.close').on('click',function(e){
chatModal.hide();
});
chatModal.on('click', function(e){
bringModalToTop(chatModal);
});
addSendHandler(chatModal, touid);
}
return chatModal;
}
function addSendHandler(chatModal, touid) {
chatModal.find('#chat-message-input').off('keypress');
chatModal.find('#chat-message-input').on('keypress', function(e) {
if(e.which === 13) {
sendMessage(chatModal, touid);
}
});
chatModal.find('#chat-message-send-btn').off('click');
chatModal.find('#chat-message-send-btn').on('click', function(e){
sendMessage(chatModal, touid);
return false;
});
}
function sendMessage(chatModal, touid) {
var msg = app.strip_tags(chatModal.find('#chat-message-input').val());
if(msg.length) {
msg = msg +'\n';
socket.emit('sendChatMessage', { touid:touid, message:msg});
chatModal.find('#chat-message-input').val('');
appendChatMessage(chatModal, 'You : ' + msg);
}
}
socket.on('chatMessage', function(data){
var username = data.username;
var fromuid = data.fromuid;
var message = data.message;
var chatModal = createModalIfDoesntExist(username, fromuid);
chatModal.show();
bringModalToTop(chatModal);
appendChatMessage(chatModal, message)
});
function appendChatMessage(chatModal, message){
var chatContent = chatModal.find('#chat-content');
chatContent.append(message);
chatContent.scrollTop(
chatContent[0].scrollHeight - chatContent.height()
);
}
//end of chat
ajaxify.register_events([ ajaxify.register_events([
'event:rep_up', 'event:rep_down', 'event:new_post', 'api:get_users_in_room', 'event:rep_up', 'event:rep_down', 'event:new_post', 'api:get_users_in_room',
'event:topic_deleted', 'event:topic_restored', 'event:topic:locked', 'event:topic_deleted', 'event:topic_restored', 'event:topic:locked',
@ -299,6 +401,7 @@
'api:posts.favourite' 'api:posts.favourite'
]); ]);
socket.on('api:get_users_in_room', function(users) { socket.on('api:get_users_in_room', function(users) {
var anonymous = users.anonymous, var anonymous = users.anonymous,
usernames = users.usernames, usernames = users.usernames,
@ -437,7 +540,7 @@
var pid = $(this).parents('li').attr('data-pid'); var pid = $(this).parents('li').attr('data-pid');
$('#post_content').val('> ' + $('#content_' + pid).html() + '\n'); $('#post_content').val('> ' + $('#content_' + pid).html() + '\n');
console.log("POST ID "+pid);
}); });
jQuery(div + ' .edit, ' + div + ' .delete').each(function() { jQuery(div + ' .edit, ' + div + ' .delete').each(function() {

6
public/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
src/websockets.js
Unescape Escape View File

@ -5,6 +5,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
config = require('../config.js'), config = require('../config.js'),
user = require('./user.js'), user = require('./user.js'),
posts = require('./posts.js'), posts = require('./posts.js'),
utils = require('./utils.js'),
topics = require('./topics.js'), topics = require('./topics.js'),
threadTools = require('./threadTools.js'), threadTools = require('./threadTools.js'),
postTools = require('./postTools.js'), postTools = require('./postTools.js'),
@ -12,7 +13,8 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
(function(io) { (function(io) {
var users = {}, var users = {},
rooms = {} userSockets = {},
rooms = {}
global.io = io; global.io = io;
@ -50,6 +52,7 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
var hs = socket.handshake; var hs = socket.handshake;
var uid = users[hs.sessionID]; var uid = users[hs.sessionID];
userSockets[uid] = socket;
user.go_online(uid); user.go_online(uid);
@ -235,6 +238,19 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
socket.on('api:posts.restore', function(data) { socket.on('api:posts.restore', function(data) {
postTools.restore(uid, data.pid); postTools.restore(uid, data.pid);
}); });
socket.on('sendChatMessage', function(data) {
var touid = data.touid;
if(userSockets[touid]) {
var msg = utils.strip_tags(data.message);
user.getUserField(uid, 'username', function(username) {
var finalMessage = username + ' says : ' + msg;
userSockets[touid].emit('chatMessage', {fromuid:uid, username:username, message:finalMessage});
});
}
});
}); });
}(SocketIO)); }(SocketIO));

Write Preview
Loading…
Cancel
Save