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

Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality

Browse Source 
Conflicts:
	src/database.js
v1.18.x
psychobunny 11 years ago
parent 3ea49a8f90 8da45b72a9
commit e5486db1ae
107 changed files with 466 additions and 447 deletions
Show Stats Download Patch File Download Diff File

2
loader.js
Unescape Escape View File

@ -105,4 +105,4 @@ if (nconf.get('d')) {
});
} else {
start();
}
}

2
minifier.js
Unescape Escape View File

@ -55,4 +55,4 @@ process.on('message', function(payload) {
Minifier.js.concatenate(payload.scripts, executeCallback);
break;
}
})
})

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

@ -13,150 +13,156 @@ var socket,
(function () {
var showWelcomeMessage = false;
var reconnecting = false;
function onSocketConnect(data) {
if (reconnecting) {
var reconnectEl = $('#reconnect');
reconnectEl.tooltip('destroy');
reconnectEl.html('<i class="fa fa-check"></i>');
reconnecting = false;
// Rejoin room that was left when we disconnected
var url_parts = document.location.pathname.slice(RELATIVE_PATH.length).split('/').slice(1);
var room;
switch(url_parts[0]) {
case 'user':
room = 'user/' + ajaxify.variables.get('theirid');
break;
case 'topic':
room = 'topic_' + url_parts[1];
break;
case 'category':
room = 'category_' + url_parts[1];
break;
case 'recent': // intentional fall-through
case 'unread':
room = 'recent_posts';
break;
case 'admin':
room = 'admin';
break;
default:
room = 'global';
break;
}
app.loadConfig = function() {
$.ajax({
url: RELATIVE_PATH + '/api/config',
success: function (data) {
config = data;
app.enterRoom(room, true);
exposeConfigToTemplates();
socket.emit('meta.reconnected');
$(window).trigger('action:reconnected');
if(socket) {
socket.disconnect();
setTimeout(function() {
socket.socket.connect();
}, 200);
} else {
var ioParams = {
'max reconnection attempts': config.maxReconnectionAttempts,
'reconnection delay': config.reconnectionDelay,
resource: RELATIVE_PATH.length ? RELATIVE_PATH.slice(1) + '/socket.io' : 'socket.io'
};
setTimeout(function() {
reconnectEl.removeClass('active').addClass("hide");
}, 3000);
}
if (utils.isAndroidBrowser()) {
ioParams.transports = ['xhr-polling'];
}
socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug']
}, app.updateHeader);
}
socket = io.connect('', ioParams);
function onConfigLoad(data) {
config = data;
var reconnecting = false,
reconnectEl, reconnectTimer;
exposeConfigToTemplates();
socket.on('event:connect', function (data) {
app.username = data.username;
app.uid = data.uid;
app.isAdmin = data.isAdmin;
if(socket) {
socket.disconnect();
setTimeout(function() {
socket.socket.connect();
}, 200);
} else {
var ioParams = {
'max reconnection attempts': config.maxReconnectionAttempts,
'reconnection delay': config.reconnectionDelay,
resource: RELATIVE_PATH.length ? RELATIVE_PATH.slice(1) + '/socket.io' : 'socket.io'
};
if (utils.isAndroidBrowser()) {
ioParams.transports = ['xhr-polling'];
}
templates.setGlobal('loggedIn', parseInt(data.uid, 10) !== 0);
socket = io.connect('', ioParams);
reconnecting = false;
app.showLoginMessage();
socket.on('event:connect', function (data) {
app.username = data.username;
app.uid = data.uid;
app.isAdmin = data.isAdmin;
socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug']
}, app.updateHeader);
templates.setGlobal('loggedIn', parseInt(data.uid, 10) !== 0);
$(window).trigger('action:connected');
});
app.showLoginMessage();
socket.on('event:alert', function (data) {
app.alert(data);
});
socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug']
}, app.updateHeader);
socket.on('connect', function (data) {
if (reconnecting) {
reconnectEl.tooltip('destroy');
reconnectEl.html('<i class="fa fa-check"></i>');
reconnecting = false;
// Rejoin room that was left when we disconnected
var url_parts = document.location.pathname.slice(RELATIVE_PATH.length).split('/').slice(1),
room;
switch(url_parts[0]) {
case 'user':
room = 'user/' + ajaxify.variables.get('theirid');
break;
case 'topic':
room = 'topic_' + url_parts[1];
break;
case 'category':
room = 'category_' + url_parts[1];
break;
case 'recent': // intentional fall-through
case 'unread':
room = 'recent_posts';
break;
case 'admin':
room = 'admin';
break;
default:
room = 'global';
break;
}
app.enterRoom(room, true);
socket.emit('meta.reconnected');
$(window).trigger('action:reconnected');
setTimeout(function() {
reconnectEl.removeClass('active').addClass("hide");
}, 3000);
}
socket.emit('meta.updateHeader', {
fields: ['username', 'picture', 'userslug']
}, app.updateHeader);
});
$(window).trigger('action:connected');
});
socket.on('event:disconnect', function() {
$(window).trigger('action:disconnected');
socket.socket.connect();
});
socket.on('event:alert', function (data) {
app.alert(data);
});
socket.on('reconnecting', function (data, attempt) {
if(attempt === config.maxReconnectionAttempts) {
socket.socket.reconnectionAttempts = 0;
socket.socket.reconnectionDelay = config.reconnectionDelay;
return;
}
socket.on('connect', onSocketConnect);
reconnectEl = reconnectEl || $('#reconnect');
reconnecting = true;
socket.on('event:disconnect', function() {
$(window).trigger('action:disconnected');
socket.socket.connect();
});
if (!reconnectEl.hasClass('active')) {
reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>');
}
socket.on('reconnecting', function (data, attempt) {
if(attempt === config.maxReconnectionAttempts) {
socket.socket.reconnectionAttempts = 0;
socket.socket.reconnectionDelay = config.reconnectionDelay;
return;
}
reconnectEl.addClass('active').removeClass("hide").tooltip({
placement: 'bottom'
});
});
reconnecting = true;
var reconnectEl = $('#reconnect');
socket.on('event:banned', function() {
app.alert({
title: '[[global:alert.banned]]',
message: '[[global:alert.banned.message]]',
type: 'warning',
timeout: 1000
});
if (!reconnectEl.hasClass('active')) {
reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>');
}
setTimeout(app.logout, 1000);
});
reconnectEl.addClass('active').removeClass("hide").tooltip({
placement: 'bottom'
});
});
socket.on('meta.updateHeader', app.updateHeader);
socket.on('event:banned', function() {
app.alert({
title: '[[global:alert.banned]]',
message: '[[global:alert.banned.message]]',
type: 'warning',
timeout: 1000
});
app.enterRoom('global');
setTimeout(app.logout, 1000);
});
if (config.environment === 'development' && console && console.log) {
var log = console.log;
console.log = function() {
log.apply(this, arguments);
socket.emit('tools.log', arguments);
};
}
}
},
socket.on('meta.updateHeader', app.updateHeader);
app.enterRoom('global');
if (config.environment === 'development' && console && console.log) {
var log = console.log;
console.log = function() {
log.apply(this, arguments);
socket.emit('tools.log', arguments);
};
}
}
}
app.loadConfig = function() {
$.ajax({
url: RELATIVE_PATH + '/api/config',
success: onConfigLoad,
async: false
});
};
@ -413,21 +419,25 @@ var socket,
app.updateHeader = function(err, data) {
$('#search-button').off().on('click', function(e) {
var searchButton = $("#search-button"),
searchFields = $("#search-fields"),
searchInput = $('#search-fields input');
function dismissSearch(){
searchFields.hide();
searchButton.show();
}
searchButton.off().on('click', function(e) {
e.stopPropagation();
$('#search-fields').removeClass('hide').show();
searchFields.removeClass('hide').show();
$(this).hide();
$('#search-fields input').focus();
$('#search-form').on('submit', function() {
$('#search-fields').hide();
$('#search-button').show();
});
searchInput.focus();
$('#search-fields input').on('blur', function() {
$('#search-fields').hide();
$('#search-button').show();
});
$('#search-form').on('submit', dismissSearch);
searchInput.on('blur', dismissSearch);
return false;
});
@ -442,7 +452,7 @@ var socket,
$('#logged-out-menu').addClass('hide');
$('#logged-in-menu').removeClass('hide');
$('#search-button').removeClass("hide").show();
searchButton.removeClass("hide").show();
var userLabel = loggedInMenu.find('#user_label');
@ -462,10 +472,10 @@ var socket,
} else {
if (allowGuestSearching) {
$('#search-button').removeClass("hide").show();
searchButton.removeClass("hide").show();
$('#mobile-search-button').removeClass("hide").show();
} else {
$('#search-button').addClass("hide").hide();
searchButton.addClass("hide").hide();
$('#mobile-search-button').addClass("hide").hide();
}
@ -477,7 +487,7 @@ var socket,
}
$('#main-nav a,#user-control-list a,#logged-out-menu li a,#logged-in-menu .visible-xs').off('click').on('click', function() {
$('#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs').off('click').on('click', function() {
if($('.navbar .navbar-collapse').hasClass('in')) {
$('.navbar-header button').click();
}
@ -582,4 +592,4 @@ var socket,
app.loadConfig();
app.alternatingTitle('');
}());
}());

2
public/src/forum/accountedit.js
Unescape Escape View File

@ -254,4 +254,4 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
}
return AccountEdit;
});
});

2
public/src/forum/accountheader.js
Unescape Escape View File

@ -38,4 +38,4 @@ define(function() {
}
return AccountHeader;
});
});

2
public/src/forum/accountposts.js
Unescape Escape View File

@ -54,4 +54,4 @@ define(['forum/accountheader'], function(header) {
}
return AccountPosts;
});
});

2
public/src/forum/accounttopics.js
Unescape Escape View File

@ -50,4 +50,4 @@ define(['forum/accountheader'], function(header) {
}
return AccountTopics;
});
});

4
public/src/forum/admin/groups.js
Unescape Escape View File

@ -146,12 +146,12 @@ define(function() {
searchResults.on('click', 'li[data-uid]', function() {
var userLabel = $(this),
uid = parseInt(userLabel.attr('data-uid')),
uid = parseInt(userLabel.attr('data-uid'), 10),
groupName = detailsModal.attr('data-groupname'),
members = [];
groupMembersEl.find('li[data-uid]').each(function() {
members.push(parseInt($(this).attr('data-uid')));
members.push(parseInt($(this).attr('data-uid'), 10));
});
if (members.indexOf(uid) === -1) {

2
public/src/forum/admin/languages.js
Unescape Escape View File

@ -5,4 +5,4 @@ define(['forum/admin/settings'], function(Settings) {
$(function() {
Settings.prepare();
});
});
});

2
public/src/forum/admin/plugins.js
Unescape Escape View File

@ -31,4 +31,4 @@ define(function() {
};
return Plugins;
});
});

2
public/src/forum/admin/settings.js
Unescape Escape View File

@ -145,4 +145,4 @@ define(['uploader', 'sounds'], function(uploader, sounds) {
}
return Settings;
});
});

2
public/src/forum/admin/sounds.js
Unescape Escape View File

@ -28,4 +28,4 @@ define(['sounds', 'settings'], function(Sounds, Settings) {
};
return SoundsAdmin;
});
});

2
public/src/forum/admin/themes.js
Unescape Escape View File

@ -318,4 +318,4 @@ define(['forum/admin/settings'], function(Settings) {
};
return Themes;
});
});

2
public/src/forum/admin/users.js
Unescape Escape View File

@ -288,4 +288,4 @@ define(function() {
};
return Users;
});
});

4
public/src/forum/category.js
Unescape Escape View File

@ -1,5 +1,5 @@
"use strict";
/* global define, config, templates, app, ajaxify, socket, translator */
/* global define, config, templates, app, utils, ajaxify, socket, translator */
define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer, pagination, share, navigator) {
var Category = {},
@ -331,4 +331,4 @@ define(['composer', 'forum/pagination', 'share', 'navigator'], function(composer
};
return Category;
});
});

2
public/src/forum/favourites.js
Unescape Escape View File

@ -50,4 +50,4 @@ define(['forum/accountheader'], function(header) {
}
return Favourites;
});
});

2
public/src/forum/followers.js
Unescape Escape View File

@ -17,4 +17,4 @@ define(['forum/accountheader'], function(header) {
};
return Followers;
});
});

2
public/src/forum/following.js
Unescape Escape View File

@ -14,4 +14,4 @@ define(['forum/accountheader'], function(header) {
};
return Following;
});
});

2
public/src/forum/footer.js
Unescape Escape View File

@ -23,4 +23,4 @@ define(['notifications', 'chat'], function(Notifications, Chat) {
socket.on('event:unread.updateCount', updateUnreadCount);
socket.emit('user.getUnreadCount', updateUnreadCount);
});
});

2
public/src/forum/notifications.js
Unescape Escape View File

@ -13,4 +13,4 @@ define(function() {
}
return Notifications;
});
});

2
public/src/forum/pagination.js
Unescape Escape View File

@ -105,4 +105,4 @@ define(function() {
}
return pagination;
});
});

2
public/src/forum/popular.js
Unescape Escape View File

@ -47,4 +47,4 @@ define(['forum/recent'], function(recent) {
};
return Popular;
});
});

2
public/src/forum/register.js
Unescape Escape View File

@ -185,4 +185,4 @@ define(function() {
};
return Register;
});
});

2
public/src/forum/reset.js
Unescape Escape View File

@ -28,4 +28,4 @@ define(function() {
};
return ResetPassword;
});
});

2
public/src/forum/reset_code.js
Unescape Escape View File

@ -52,4 +52,4 @@ define(function() {
};
return ResetCode;
});
});

2
public/src/forum/search.js
Unescape Escape View File

@ -24,4 +24,4 @@ define(function() {
};
return Search;
});
});

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

@ -759,4 +759,4 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools',
}
return Topic;
});
});

2
public/src/forum/topic/fork.js
Unescape Escape View File

@ -112,4 +112,4 @@ define(function() {
}
return Fork;
});
});

2
public/src/forum/topic/move.js
Unescape Escape View File

@ -97,4 +97,4 @@ define(function() {
};
return Move;
});
});

2
public/src/forum/topic/postTools.js
Unescape Escape View File

@ -247,4 +247,4 @@ define(['composer', 'share'], function(composer, share) {
}
return PostTools;
});
});

2
public/src/forum/topic/threadTools.js
Unescape Escape View File

@ -94,4 +94,4 @@ define(['forum/topic/fork', 'forum/topic/move'], function(fork, move) {
return ThreadTools;
});
});

2
public/src/forum/unread.js
Unescape Escape View File

@ -172,4 +172,4 @@ define(['forum/recent'], function(recent) {
}
return Unread;
});
});

2
public/src/forum/users.js
Unescape Escape View File

@ -169,4 +169,4 @@ define(function() {
};
return Users;
});
});

2
public/src/helpers.js
Unescape Escape View File

@ -36,4 +36,4 @@
module: {
exports: {}
}
} : module);
} : module);

2
public/src/modules/alerts.js
Unescape Escape View File

@ -91,4 +91,4 @@ define(function() {
};
return module;
});
});

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

@ -275,4 +275,4 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
};
return module;
});
});

275
public/src/modules/composer.js
Unescape Escape View File

@ -188,18 +188,17 @@ define(['taskbar'], function(taskbar) {
var draggingDocument = false;
var postContainer = $('#cmp-uuid-' + post_uuid),
fileForm = postContainer.find('#fileForm'),
drop = postContainer.find('.imagedrop'),
tabContent = postContainer.find('.tab-content'),
textarea = postContainer.find('textarea');
$(document).off('dragstart').on('dragstart', function(e) {
$(document).off('dragstart').on('dragstart', function() {
draggingDocument = true;
}).off('dragend').on('dragend', function(e) {
}).off('dragend').on('dragend', function() {
draggingDocument = false;
});
textarea.on('dragenter', function(e) {
textarea.on('dragenter', function() {
if(draggingDocument) {
return;
}
@ -208,7 +207,7 @@ define(['taskbar'], function(taskbar) {
drop.css('line-height', textarea.height() + 'px');
drop.show();
drop.on('dragleave', function(ev) {
drop.on('dragleave', function() {
drop.hide();
drop.off('dragleave');
});
@ -235,7 +234,6 @@ define(['taskbar'], function(taskbar) {
}
}
// fileForm[0].reset();
uploadContentFiles({
files: files,
post_uuid: post_uuid,
@ -264,7 +262,6 @@ define(['taskbar'], function(taskbar) {
fd.append('files[]', blob, blob.name);
}
// fileForm[0].reset();
uploadContentFiles({
files: [blob],
post_uuid: post_uuid,
@ -277,7 +274,7 @@ define(['taskbar'], function(taskbar) {
}
function escapeRegExp(text) {
return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
return text.replace(/[\-\[\]\{\}\(\)\*\+\?\.\,\\\^\$\|\#\s]/g, "\\$&");
}
function uploadContentFiles(params) {
@ -417,66 +414,161 @@ define(['taskbar'], function(taskbar) {
thumbForm.submit();
}
function handleFormattingBarClick() {
var iconClass = $(this).find('i').attr('class');
var textarea = $(this).parents('.composer').find('textarea')[0];
var textareaValue = $(textarea).val();
var selectionStart = textarea.selectionStart,
selectionEnd = textarea.selectionEnd,
selectionLength = selectionEnd - selectionStart,
isSelectionAtEnd = selectionStart === selectionEnd;
function updateSelection(start, end){
textarea.setSelectionRange(start, end);
textarea.focus();
}
function insertIntoInput(value) {
$(textarea).val(textareaValue.slice(0, selectionStart) + value + textareaValue.slice(selectionStart));
}
function wrapSelectedWith(leading, trailing){
if(trailing === undefined){
trailing = leading;
}
$(textarea).val(textareaValue.slice(0, selectionStart) + leading + textareaValue.slice(selectionStart, selectionEnd) + trailing + textareaValue.slice(selectionEnd));
}
if(iconClass === 'fa fa-bold') {
if (isSelectionAtEnd) {
insertIntoInput("**bolded text**");
updateSelection(selectionStart + 2, selectionStart + 13);
} else {
wrapSelectedWith('**');
// Highlight selection
updateSelection(selectionStart + 2, selectionEnd + 2);
}
}
if(iconClass === 'fa fa-italic') {
if (isSelectionAtEnd) {
insertIntoInput("*italicised text*");
// Highlight selection
updateSelection(selectionStart + 1, selectionStart + 16);
} else {
wrapSelectedWith('*');
// Highlight selection
updateSelection(selectionStart + 1, selectionEnd + 1);
}
}
if (iconClass === 'fa fa-list'){
if(isSelectionAtEnd){
insertIntoInput("\n* list item");
// Highlight "list item"
updateSelection(selectionStart + 3, selectionStart + 12);
} else {
wrapSelectedWith('\n* ', '');
// Maintain selection:
updateSelection(selectionStart + 3, selectionEnd + 3);
}
}
if (iconClass === 'fa fa-link') {
if (isSelectionAtEnd) {
insertIntoInput("[link text](link url)");
// Highlight "link url"
updateSelection(selectionStart + 12, selectionEnd + 20);
} else {
wrapSelectedWith('[', '](link url)');
// Highlight "link url"
updateSelection(selectionStart + selectionLength + 3, selectionEnd + 11);
}
}
}
composer.newTopic = function(cid) {
if(allowed()) {
push({
cid: cid,
title: '',
body: '',
modified: false,
isMain: true
});
if(!allowed()) {
return;
}
push({
cid: cid,
title: '',
body: '',
modified: false,
isMain: true
});
};
composer.addQuote = function(tid, pid, title, username, text){
if (allowed()) {
var uuid = composer.active;
if(uuid !== undefined){
var bodyEl = $('#cmp-uuid-'+uuid).find('textarea');
var prevText = bodyEl.val();
if(tid !== composer.posts[uuid].tid) {
text = username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text;
} else {
text = username + ' said:\n' + text;
}
composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + text;
bodyEl.val(composer.posts[uuid].body);
} else {
composer.newReply(tid, pid, title, username + ' said:\n' + text);
}
if (!allowed()) {
return;
}
var uuid = composer.active;
if(uuid === undefined){
composer.newReply(tid, pid, title, username + ' said:\n' + text);
return;
}
var bodyEl = $('#cmp-uuid-'+uuid).find('textarea');
var prevText = bodyEl.val();
if(tid !== composer.posts[uuid].tid) {
text = username + ' said in ['+title+'](/topic/'+tid+'#'+pid+'):\n'+text;
} else {
text = username + ' said:\n' + text;
}
composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + text;
bodyEl.val(composer.posts[uuid].body);
};
composer.newReply = function(tid, pid, title, text) {
if(allowed()) {
push({
tid: tid,
toPid: pid,
title: title,
body: text,
modified: false,
isMain: false
});
if(!allowed()) {
return;
}
push({
tid: tid,
toPid: pid,
title: title,
body: text,
modified: false,
isMain: false
});
};
composer.editPost = function(pid) {
if(allowed()) {
socket.emit('modules.composer.push', pid, function(err, threadData) {
if(err) {
return app.alertError(err.message);
}
push({
pid: pid,
title: threadData.title,
body: threadData.body,
modified: false,
isMain: !threadData.index,
topic_thumb: threadData.topic_thumb
});
});
if(!allowed()) {
return;
}
socket.emit('modules.composer.push', pid, function(err, threadData) {
if(err) {
return app.alertError(err.message);
}
push({
pid: pid,
title: threadData.title,
body: threadData.body,
modified: false,
isMain: !threadData.index,
topic_thumb: threadData.topic_thumb
});
});
};
composer.load = function(post_uuid) {
@ -576,7 +668,7 @@ define(['taskbar'], function(taskbar) {
e.preventDefault();
});
postContainer.on('paste change keypress', 'input#topic-thumb-url', function(e) {
postContainer.on('paste change keypress', 'input#topic-thumb-url', function() {
var urlEl = $(this);
setTimeout(function(){
var url = urlEl.val();
@ -616,72 +708,7 @@ define(['taskbar'], function(taskbar) {
}
});
postContainer.on('click', '.formatting-bar span', function() {
var postContentEl = postContainer.find('textarea'),
iconClass = $(this).find('i').attr('class'),
cursorEnd = postContentEl.val().length,
selectionStart = postContentEl[0].selectionStart,
selectionEnd = postContentEl[0].selectionEnd,
selectionLength = selectionEnd - selectionStart,
cursorPos;
function insertIntoInput(element, value) {
var start = postContentEl[0].selectionStart;
element.val(element.val().slice(0, start) + value + element.val().slice(start, element.val().length));
postContentEl[0].selectionStart = postContentEl[0].selectionEnd = start + value.length;
}
switch(iconClass) {
case 'fa fa-bold':
if (selectionStart === selectionEnd) {
// Nothing selected
cursorPos = postContentEl[0].selectionStart;
insertIntoInput(postContentEl, "**bolded text**");
// Highlight "link url"
postContentEl[0].selectionStart = cursorPos + 12;
postContentEl[0].selectionEnd = cursorPos + 20;
} else {
// Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd));
postContentEl[0].selectionStart = selectionStart + 2;
postContentEl[0].selectionEnd = selectionEnd + 2;
}
break;
case 'fa fa-italic':
if (selectionStart === selectionEnd) {
// Nothing selected
insertIntoInput(postContentEl, "*italicised text*");
} else {
// Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '*' + postContentEl.val().slice(selectionStart, selectionEnd) + '*' + postContentEl.val().slice(selectionEnd));
postContentEl[0].selectionStart = selectionStart + 1;
postContentEl[0].selectionEnd = selectionEnd + 1;
}
break;
case 'fa fa-list':
// Nothing selected
insertIntoInput(postContentEl, "\n* list item");
break;
case 'fa fa-link':
if (selectionStart === selectionEnd) {
// Nothing selected
cursorPos = postContentEl[0].selectionStart;
insertIntoInput(postContentEl, "[link text](link url)");
// Highlight "link url"
postContentEl[0].selectionStart = cursorPos + 12;
postContentEl[0].selectionEnd = cursorPos + 20;
} else {
// Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd));
postContentEl[0].selectionStart = selectionStart + selectionLength + 3;
postContentEl[0].selectionEnd = selectionEnd + 11;
}
break;
}
});
postContainer.on('click', '.formatting-bar span', handleFormattingBarClick);
postContainer.on('click', '.formatting-bar span .fa-picture-o, .formatting-bar span .fa-upload', function() {
$('#files').click();
@ -871,11 +898,11 @@ define(['taskbar'], function(taskbar) {
titleEl = postContainer.find('.title'),
bodyEl = postContainer.find('textarea');
if ((parseInt(postData.tid) || parseInt(postData.pid)) > 0) {
if ((parseInt(postData.tid, 10) || parseInt(postData.pid, 10)) > 0) {
bodyEl.focus();
bodyEl.selectionStart = bodyEl.val().length;
bodyEl.selectionEnd = bodyEl.val().length;
} else if (parseInt(postData.cid) > 0) {
} else if (parseInt(postData.cid, 10) > 0) {
titleEl.focus();
}
};
@ -971,4 +998,4 @@ define(['taskbar'], function(taskbar) {
load: composer.load,
minimize: composer.minimize
};
});
});

2
public/src/modules/navigator.js
Unescape Escape View File

@ -101,4 +101,4 @@ define(function() {
}
return navigator;
});
});

2
public/src/modules/notifications.js
Unescape Escape View File

@ -117,4 +117,4 @@ define(['sounds'], function(sound) {
};
return Notifications;
});
});

2
public/src/modules/settings.js
Unescape Escape View File

@ -65,4 +65,4 @@ define(function() {
};
return Settings;
});
});

2
public/src/modules/share.js
Unescape Escape View File

@ -53,4 +53,4 @@ define(function() {
}
return module;
});
});

2
public/src/modules/sounds.js
Unescape Escape View File

@ -71,4 +71,4 @@ define(['buzz'], function(buzz) {
};
return Sounds;
});
});

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

File diff suppressed because one or more lines are too long

2
public/src/modules/taskbar.js
Unescape Escape View File

@ -110,4 +110,4 @@ define(function() {
toggleNew: taskbar.toggleNew,
updateActive: taskbar.updateActive
}
});
});

2
public/src/modules/uploader.js
Unescape Escape View File

@ -100,4 +100,4 @@ define(function() {
};
return module;
});
});

2
public/src/overrides.js
Unescape Escape View File

@ -73,4 +73,4 @@ if ('undefined' !== typeof window) {
e.button === 2 || _clearMenus();
});
}
}

2
public/src/templates.js
Unescape Escape View File

@ -322,4 +322,4 @@
module: {
exports: {}
}
} : module);
} : module);

2
public/src/translator.js
Unescape Escape View File

@ -232,4 +232,4 @@
module: {
exports: {}
}
} : module);
} : module);

2
public/src/utils.js
Unescape Escape View File

@ -274,4 +274,4 @@
module: {
exports: {}
}
} : module);
} : module);

2
public/src/variables.js
Unescape Escape View File

@ -38,4 +38,4 @@
ajaxify.variables.set($(element).attr('template-variable'), value);
});
};
}(ajaxify || {}));
}(ajaxify || {}));

2
public/src/widgets.js
Unescape Escape View File

@ -79,4 +79,4 @@
checkCallback();
};
}(ajaxify || {}));
}(ajaxify || {}));

2
src/categories.js
Unescape Escape View File

@ -324,4 +324,4 @@ var db = require('./database'),
emitter.on('event:newpost', Categories.onNewPostMade);
}(exports));
}(exports));

2
src/categories/activeusers.js
Unescape Escape View File

@ -80,4 +80,4 @@ module.exports = function(Categories) {
}
});
};
};
};

2
src/categories/update.js
Unescape Escape View File

@ -43,4 +43,4 @@ module.exports = function(Categories) {
});
};
};
};

80
src/categoryTools.js
Unescape Escape View File

@ -4,9 +4,31 @@ var Groups = require('./groups'),
User = require('./user'),
async = require('async'),
db = require('./database'),
db = require('./database');
CategoryTools = {};
var internals = {
isMember: function(key, candidate, next){
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMember(candidate, key, next);
} else {
next(null, null);
}
});
},
isMemberOfGroupList: function(key, candidate, next){
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMemberOfGroupList(candidate, key, next);
} else {
next(null, null);
}
});
}
};
var CategoryTools = {};
CategoryTools.exists = function(cid, callback) {
db.isSortedSetMember('categories:cid', cid, callback);
@ -15,44 +37,16 @@ CategoryTools.exists = function(cid, callback) {
CategoryTools.privileges = function(cid, uid, callback) {
async.parallel({
"+r": function(next) {
var key = 'cid:' + cid + ':privileges:+r';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMember(uid, key, next);
} else {
next(null, null);
}
});
internals.isMember('cid:' + cid + ':privileges:+r', uid, next);
},
"+w": function(next) {
var key = 'cid:' + cid + ':privileges:+w';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMember(uid, key, next);
} else {
next(null, null);
}
});
internals.isMember('cid:' + cid + ':privileges:+w', uid, next);
},
"g+r": function(next) {
var key = 'cid:' + cid + ':privileges:g+r';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMemberOfGroupList(uid, key, next);
} else {
next(null, null);
}
});
internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+r', uid, next);
},
"g+w": function(next) {
var key = 'cid:' + cid + ':privileges:g+w';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMemberOfGroupList(uid, key, next);
} else {
next(null, null);
}
});
internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+w', uid, next);
},
moderator: function(next) {
User.isModerator(uid, cid, next);
@ -93,23 +87,13 @@ CategoryTools.privileges = function(cid, uid, callback) {
CategoryTools.groupPrivileges = function(cid, groupName, callback) {
async.parallel({
"g+r": function(next) {
var key = 'cid:' + cid + ':privileges:g+r';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMember(groupName, key, next);
} else {
next(null, false);
}
internals.isMember('cid:' + cid + ':privileges:g+r', groupName, function(err, isMember){
next(err, !!isMember);
});
},
"g+w": function(next) {
var key = 'cid:' + cid + ':privileges:g+w';
Groups.exists(key, function(err, exists) {
if (exists) {
Groups.isMember(groupName, key, next);
} else {
next(null, false);
}
internals.isMember('cid:' + cid + ':privileges:g+w', groupName, function(err, isMember){
next(err, !!isMember);
});
}
}, function(err, privileges) {

2
src/controllers/accounts.js
Unescape Escape View File

@ -468,4 +468,4 @@ accountsController.getNotifications = function(req, res, next) {
});
};
module.exports = accountsController;
module.exports = accountsController;

2
src/controllers/admin.js
Unescape Escape View File

@ -169,4 +169,4 @@ adminController.sounds.get = function(req, res, next) {
});
};
module.exports = adminController;
module.exports = adminController;

2
src/controllers/admin/users.js
Unescape Escape View File

@ -47,4 +47,4 @@ usersController.getCSV = function(req, res, next) {
});
};
module.exports = usersController;
module.exports = usersController;

2
src/controllers/api.js
Unescape Escape View File

@ -70,4 +70,4 @@ apiController.getConfig = function(req, res, next) {
};
module.exports = apiController;
module.exports = apiController;

2
src/controllers/index.js
Unescape Escape View File

@ -266,4 +266,4 @@ Controllers.outgoing = function(req, res, next) {
}
};
module.exports = Controllers;
module.exports = Controllers;

2
src/controllers/topics.js
Unescape Escape View File

@ -181,4 +181,4 @@ topicsController.get = function(req, res, next) {
});
};
module.exports = topicsController;
module.exports = topicsController;

2
src/controllers/users.js
Unescape Escape View File

@ -100,4 +100,4 @@ usersController.getUsersForSearch = function(req, res, next) {
module.exports = usersController;
module.exports = usersController;

2
src/emailer.js
Unescape Escape View File

@ -50,4 +50,4 @@ Emailer.send = function(template, uid, params) {
});
};
module.exports = Emailer;
module.exports = Emailer;

2
src/emitter.js
Unescape Escape View File

@ -1,4 +1,4 @@
var events = require('events'),
eventEmitter = new events.EventEmitter();
module.exports = eventEmitter;
module.exports = eventEmitter;

2
src/events.js
Unescape Escape View File

@ -113,4 +113,4 @@ var fs = require('fs'),
});
};
}(module.exports));
}(module.exports));

2
src/favourites.js
Unescape Escape View File

@ -217,4 +217,4 @@ var async = require('async'),
}, callback);
};
}(exports));
}(exports));

2
src/image.js
Unescape Escape View File

@ -44,4 +44,4 @@ image.convertImageToBase64 = function(path, callback) {
});
};
module.exports = image;
module.exports = image;

2
src/install.js
Unescape Escape View File

@ -429,4 +429,4 @@ install.save = function (server_conf, callback) {
});
};
module.exports = install;
module.exports = install;

2
src/languages.js
Unescape Escape View File

@ -42,4 +42,4 @@ Languages.list = function(callback) {
});
};
module.exports = Languages;
module.exports = Languages;

2
src/messaging.js
Unescape Escape View File

@ -147,4 +147,4 @@ var db = require('./database'),
});
};
}(exports));
}(exports));

2
src/middleware/admin.js
Unescape Escape View File

@ -89,4 +89,4 @@ middleware.buildHeader = function(req, res, next) {
module.exports = function(webserver) {
app = webserver;
return middleware;
};
};

2
src/middleware/index.js
Unescape Escape View File

@ -217,4 +217,4 @@ module.exports = function(app, data) {
});
return middleware;
};
};

2
src/middleware/middleware.js
Unescape Escape View File

@ -345,4 +345,4 @@ module.exports = function(webserver) {
middleware.admin = require('./admin')(webserver);
return middleware;
};
};

65
src/plugins.js
Unescape Escape View File

@ -72,25 +72,21 @@ var fs = require('fs'),
db.getSetMembers('plugins:active', next);
},
function(plugins, next) {
if (plugins && Array.isArray(plugins)) {
plugins.push(meta.config['theme:id']);
if (!plugins || !Array.isArray(plugins)) {
next();
}
async.each(plugins, function(plugin, next) {
if (!plugin || typeof plugin !== 'string') {
return next();
}
plugins.push(meta.config['theme:id']);
var modulePath = path.join(__dirname, '../node_modules/', plugin);
if (fs.existsSync(modulePath)) {
Plugins.loadPlugin(modulePath, next);
} else {
if (global.env === 'development') {
winston.warn('[plugins] Plugin \'' + plugin + '\' not found');
}
next(); // Ignore this plugin silently
}
}, next);
} else next();
plugins = plugins.filter(function(plugin){
return plugin && typeof plugin === 'string';
}).map(function(plugin){
return path.join(__dirname, '../node_modules/', plugin);
});
async.filter(plugins, fs.exists, function(plugins){
async.each(plugins, Plugins.loadPlugin, next);
});
},
function(next) {
if (global.env === 'development') winston.info('[plugins] Sorting hooks to fire in priority sequence');
@ -434,28 +430,31 @@ var fs = require('fs'),
};
Plugins.showInstalled = function(callback) {
npmPluginPath = path.join(__dirname, '../node_modules');
var npmPluginPath = path.join(__dirname, '../node_modules');
async.waterfall([
function(next) {
fs.readdir(npmPluginPath, function(err, dirs) {
dirs = dirs.map(function(file) {
return path.join(npmPluginPath, file);
}).filter(function(file) {
if (fs.existsSync(file)) {
var stats = fs.statSync(file),
isPlugin = file.substr(npmPluginPath.length + 1, 14) === 'nodebb-plugin-' || file.substr(npmPluginPath.length + 1, 14) === 'nodebb-widget-';
if (stats.isDirectory() && isPlugin) return true;
else return false;
} else {
return false;
async.apply(fs.readdir, npmPluginPath),
function(dirs, next) {
dirs = dirs.filter(function(dir){
return dir.substr(0, 14) === 'nodebb-plugin-' || dir.substr(0, 14) === 'nodebb-widget-';
}).map(function(dir){
return path.join(npmPluginPath, dir);
});
async.filter(dirs, function(dir, callback){
fs.stat(dir, function(err, stats){
if (err) {
return callback(false);
}
});
next(err, dirs);
callback(stats.isDirectory());
})
}, function(plugins){
next(null, plugins);
});
},
function(files, next) {
var plugins = [];

2
src/routes/authentication.js
Unescape Escape View File

@ -214,4 +214,4 @@
uid: uid
});
});
}(exports));
}(exports));

2
src/routes/debug.js
Unescape Escape View File

@ -58,4 +58,4 @@ module.exports = function(app, middleware, controllers) {
res.send(200);
});
});
};
};

2
src/routes/feeds.js
Unescape Escape View File

@ -166,4 +166,4 @@ module.exports = function(app, middleware, controllers){
app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
app.get('/recent.rss', generateForRecent);
app.get('/popular.rss', generateForPopular);
};
};

2
src/routes/index.js
Unescape Escape View File

@ -152,4 +152,4 @@ module.exports = function(app, middleware) {
require('./debug')(app, middleware, controllers);
}
});
};
};

2
src/routes/plugins.js
Unescape Escape View File

@ -51,4 +51,4 @@ module.exports = function(app, middleware, controllers) {
res.redirect('/404');
}
});
};
};

2
src/sitemap.js
Unescape Escape View File

@ -88,4 +88,4 @@ var path = require('path'),
}
};
module.exports = sitemap;
module.exports = sitemap;

2
src/socket.io/categories.js
Unescape Escape View File

@ -47,4 +47,4 @@ SocketCategories.getTopicCount = function(socket, cid, callback) {
categories.getCategoryField(cid, 'topic_count', callback);
};
module.exports = SocketCategories;
module.exports = SocketCategories;

2
src/socket.io/index.js
Unescape Escape View File

@ -319,4 +319,4 @@ function emitOnlineUserCount(callback) {
/* Exporting */
module.exports = Sockets;
module.exports = Sockets;

2
src/socket.io/meta.js
Unescape Escape View File

@ -111,4 +111,4 @@ SocketMeta.rooms.getAll = function(socket, data, callback) {
/* Exports */
module.exports = SocketMeta;
module.exports = SocketMeta;

2
src/socket.io/modules.js
Unescape Escape View File

@ -231,4 +231,4 @@ SocketModules.sounds.getMapping = function(socket, data, callback) {
meta.sounds.getMapping(callback);
};
module.exports = SocketModules;
module.exports = SocketModules;

2
src/socket.io/notifications.js
Unescape Escape View File

@ -12,4 +12,4 @@ SocketNotifs.getCount = function(socket, data, callback) {
user.notifications.getUnreadCount(socket.uid, callback);
};
module.exports = SocketNotifs;
module.exports = SocketNotifs;

2
src/socket.io/posts.js
Unescape Escape View File

@ -318,4 +318,4 @@ SocketPosts.getCategory = function(socket, pid, callback) {
posts.getCidByPid(pid, callback);
};
module.exports = SocketPosts;
module.exports = SocketPosts;

2
src/socket.io/tools.js
Unescape Escape View File

@ -6,4 +6,4 @@ SocketTools.log = function(socket, data, callback) {
//winston.info("captured console.log:", data)
};
module.exports = SocketTools;
module.exports = SocketTools;

2
src/socket.io/topics.js
Unescape Escape View File

@ -313,4 +313,4 @@ SocketTopics.getTidIndex = function(socket, tid, callback) {
categories.getTopicIndex(tid, callback);
};
module.exports = SocketTopics;
module.exports = SocketTopics;

2
src/socket.io/user.js
Unescape Escape View File

@ -248,4 +248,4 @@ SocketUser.setStatus = function(socket, status, callback) {
/* Exports */
module.exports = SocketUser;
module.exports = SocketUser;

2
src/socket.io/widgets.js
Unescape Escape View File

@ -8,4 +8,4 @@ SocketWidgets.render = function(socket, data, callback) {
widgets.render(socket.uid, data, callback);
};
module.exports = SocketWidgets;
module.exports = SocketWidgets;

2
src/threadTools.js
Unescape Escape View File

@ -293,4 +293,4 @@ var winston = require('winston'),
});
});
};
}(exports));
}(exports));

2
src/topics.js
Unescape Escape View File

@ -478,4 +478,4 @@ var async = require('async'),
});
});
};
}(exports));
}(exports));

2
src/topics/create.js
Unescape Escape View File

@ -219,4 +219,4 @@ module.exports = function(Topics) {
], callback);
};
};
};

2
src/topics/fork.js
Unescape Escape View File

@ -99,4 +99,4 @@ module.exports = function(Topics) {
});
});
};
};
};

2
src/topics/unread.js
Unescape Escape View File

@ -223,4 +223,4 @@ module.exports = function(Topics) {
};
};
};

2
src/upgrade.js
Unescape Escape View File

@ -628,4 +628,4 @@ Upgrade.upgrade = function(callback) {
});
};
module.exports = Upgrade;
module.exports = Upgrade;

2
src/user/create.js
Unescape Escape View File

@ -141,4 +141,4 @@ module.exports = function(User) {
});
});
};
};
};

2
src/user/follow.js
Unescape Escape View File

@ -65,4 +65,4 @@ module.exports = function(User) {
db.isSetMember('following:' + uid, theirid, callback);
};
};
};

2
src/user/notifications.js
Unescape Escape View File

@ -180,4 +180,4 @@ var async = require('async'),
});
};
}(exports));
}(exports));

2
src/user/profile.js
Unescape Escape View File

@ -253,4 +253,4 @@ module.exports = function(User) {
}
};
};
};

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save