diff --git a/loader.js b/loader.js index 20f9d49f88..204892b741 100644 --- a/loader.js +++ b/loader.js @@ -105,4 +105,4 @@ if (nconf.get('d')) { }); } else { start(); -} \ No newline at end of file +} diff --git a/minifier.js b/minifier.js index cddcd92b51..b4354db0ba 100644 --- a/minifier.js +++ b/minifier.js @@ -55,4 +55,4 @@ process.on('message', function(payload) { Minifier.js.concatenate(payload.scripts, executeCallback); break; } -}) \ No newline at end of file +}) diff --git a/public/src/app.js b/public/src/app.js index 108635da2e..4725ca9866 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -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(''); + 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(''); - 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(''); - } + 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(''); + } - 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(''); -}()); \ No newline at end of file +}()); diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js index 071cb31a3a..fb272984b8 100644 --- a/public/src/forum/accountedit.js +++ b/public/src/forum/accountedit.js @@ -254,4 +254,4 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { } return AccountEdit; -}); \ No newline at end of file +}); diff --git a/public/src/forum/accountheader.js b/public/src/forum/accountheader.js index 4ff2f1be63..c2d33546eb 100644 --- a/public/src/forum/accountheader.js +++ b/public/src/forum/accountheader.js @@ -38,4 +38,4 @@ define(function() { } return AccountHeader; -}); \ No newline at end of file +}); diff --git a/public/src/forum/accountposts.js b/public/src/forum/accountposts.js index c1e304c3b7..737cb41916 100644 --- a/public/src/forum/accountposts.js +++ b/public/src/forum/accountposts.js @@ -54,4 +54,4 @@ define(['forum/accountheader'], function(header) { } return AccountPosts; -}); \ No newline at end of file +}); diff --git a/public/src/forum/accounttopics.js b/public/src/forum/accounttopics.js index ed94057c4d..ae91e98df5 100644 --- a/public/src/forum/accounttopics.js +++ b/public/src/forum/accounttopics.js @@ -50,4 +50,4 @@ define(['forum/accountheader'], function(header) { } return AccountTopics; -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/groups.js b/public/src/forum/admin/groups.js index 31d52f7f2a..9e3d9b7608 100644 --- a/public/src/forum/admin/groups.js +++ b/public/src/forum/admin/groups.js @@ -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) { diff --git a/public/src/forum/admin/languages.js b/public/src/forum/admin/languages.js index b5f1a1523d..a01b0b90af 100644 --- a/public/src/forum/admin/languages.js +++ b/public/src/forum/admin/languages.js @@ -5,4 +5,4 @@ define(['forum/admin/settings'], function(Settings) { $(function() { Settings.prepare(); }); -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/plugins.js b/public/src/forum/admin/plugins.js index 1de7c4637b..a494f3053d 100644 --- a/public/src/forum/admin/plugins.js +++ b/public/src/forum/admin/plugins.js @@ -31,4 +31,4 @@ define(function() { }; return Plugins; -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js index b27b11c72e..cddd48428b 100644 --- a/public/src/forum/admin/settings.js +++ b/public/src/forum/admin/settings.js @@ -145,4 +145,4 @@ define(['uploader', 'sounds'], function(uploader, sounds) { } return Settings; -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/sounds.js b/public/src/forum/admin/sounds.js index b58acc6ac2..5dc7047b54 100644 --- a/public/src/forum/admin/sounds.js +++ b/public/src/forum/admin/sounds.js @@ -28,4 +28,4 @@ define(['sounds', 'settings'], function(Sounds, Settings) { }; return SoundsAdmin; -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index acfb6f3e6e..4dd38c1d92 100644 --- a/public/src/forum/admin/themes.js +++ b/public/src/forum/admin/themes.js @@ -318,4 +318,4 @@ define(['forum/admin/settings'], function(Settings) { }; return Themes; -}); \ No newline at end of file +}); diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 229c45cfb1..e52a8d78f9 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -288,4 +288,4 @@ define(function() { }; return Users; -}); \ No newline at end of file +}); diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 7182aa19dc..adb5bc34c7 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -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; -}); \ No newline at end of file +}); diff --git a/public/src/forum/favourites.js b/public/src/forum/favourites.js index f9944e5e29..c3810a316c 100644 --- a/public/src/forum/favourites.js +++ b/public/src/forum/favourites.js @@ -50,4 +50,4 @@ define(['forum/accountheader'], function(header) { } return Favourites; -}); \ No newline at end of file +}); diff --git a/public/src/forum/followers.js b/public/src/forum/followers.js index 15263c142e..40a2550ba6 100644 --- a/public/src/forum/followers.js +++ b/public/src/forum/followers.js @@ -17,4 +17,4 @@ define(['forum/accountheader'], function(header) { }; return Followers; -}); \ No newline at end of file +}); diff --git a/public/src/forum/following.js b/public/src/forum/following.js index 80571cd19d..4dd6636692 100644 --- a/public/src/forum/following.js +++ b/public/src/forum/following.js @@ -14,4 +14,4 @@ define(['forum/accountheader'], function(header) { }; return Following; -}); \ No newline at end of file +}); diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index f93277a4b5..585b9722c9 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -23,4 +23,4 @@ define(['notifications', 'chat'], function(Notifications, Chat) { socket.on('event:unread.updateCount', updateUnreadCount); socket.emit('user.getUnreadCount', updateUnreadCount); -}); \ No newline at end of file +}); diff --git a/public/src/forum/notifications.js b/public/src/forum/notifications.js index 38bb3c80a2..55b7268a36 100644 --- a/public/src/forum/notifications.js +++ b/public/src/forum/notifications.js @@ -13,4 +13,4 @@ define(function() { } return Notifications; -}); \ No newline at end of file +}); diff --git a/public/src/forum/pagination.js b/public/src/forum/pagination.js index 9a0ea4cf73..d34bf2cfd7 100644 --- a/public/src/forum/pagination.js +++ b/public/src/forum/pagination.js @@ -105,4 +105,4 @@ define(function() { } return pagination; -}); \ No newline at end of file +}); diff --git a/public/src/forum/popular.js b/public/src/forum/popular.js index 5b99451cf3..e8b35729a4 100644 --- a/public/src/forum/popular.js +++ b/public/src/forum/popular.js @@ -47,4 +47,4 @@ define(['forum/recent'], function(recent) { }; return Popular; -}); \ No newline at end of file +}); diff --git a/public/src/forum/register.js b/public/src/forum/register.js index 871c199239..b389b5adc4 100644 --- a/public/src/forum/register.js +++ b/public/src/forum/register.js @@ -185,4 +185,4 @@ define(function() { }; return Register; -}); \ No newline at end of file +}); diff --git a/public/src/forum/reset.js b/public/src/forum/reset.js index 95ee52a939..a85c02cf46 100644 --- a/public/src/forum/reset.js +++ b/public/src/forum/reset.js @@ -28,4 +28,4 @@ define(function() { }; return ResetPassword; -}); \ No newline at end of file +}); diff --git a/public/src/forum/reset_code.js b/public/src/forum/reset_code.js index 0215669c39..b7a0d9caca 100644 --- a/public/src/forum/reset_code.js +++ b/public/src/forum/reset_code.js @@ -52,4 +52,4 @@ define(function() { }; return ResetCode; -}); \ No newline at end of file +}); diff --git a/public/src/forum/search.js b/public/src/forum/search.js index e6cdcca11e..7543363e3b 100644 --- a/public/src/forum/search.js +++ b/public/src/forum/search.js @@ -24,4 +24,4 @@ define(function() { }; return Search; -}); \ No newline at end of file +}); diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index d752dff4da..833255ead9 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -759,4 +759,4 @@ define(['forum/pagination', 'forum/topic/threadTools', 'forum/topic/postTools', } return Topic; -}); \ No newline at end of file +}); diff --git a/public/src/forum/topic/fork.js b/public/src/forum/topic/fork.js index e4b29e9534..13cdb54adb 100644 --- a/public/src/forum/topic/fork.js +++ b/public/src/forum/topic/fork.js @@ -112,4 +112,4 @@ define(function() { } return Fork; -}); \ No newline at end of file +}); diff --git a/public/src/forum/topic/move.js b/public/src/forum/topic/move.js index 1408e51b8a..1b17a9af37 100644 --- a/public/src/forum/topic/move.js +++ b/public/src/forum/topic/move.js @@ -97,4 +97,4 @@ define(function() { }; return Move; -}); \ No newline at end of file +}); diff --git a/public/src/forum/topic/postTools.js b/public/src/forum/topic/postTools.js index c419539f29..7b6452359b 100644 --- a/public/src/forum/topic/postTools.js +++ b/public/src/forum/topic/postTools.js @@ -247,4 +247,4 @@ define(['composer', 'share'], function(composer, share) { } return PostTools; -}); \ No newline at end of file +}); diff --git a/public/src/forum/topic/threadTools.js b/public/src/forum/topic/threadTools.js index 0836b8d3b5..186bf682c6 100644 --- a/public/src/forum/topic/threadTools.js +++ b/public/src/forum/topic/threadTools.js @@ -94,4 +94,4 @@ define(['forum/topic/fork', 'forum/topic/move'], function(fork, move) { return ThreadTools; -}); \ No newline at end of file +}); diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index 491945268b..cdfe192df3 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -172,4 +172,4 @@ define(['forum/recent'], function(recent) { } return Unread; -}); \ No newline at end of file +}); diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 2b822f1c18..d4192d30c1 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -169,4 +169,4 @@ define(function() { }; return Users; -}); \ No newline at end of file +}); diff --git a/public/src/helpers.js b/public/src/helpers.js index e273671782..407ee3bf17 100644 --- a/public/src/helpers.js +++ b/public/src/helpers.js @@ -36,4 +36,4 @@ module: { exports: {} } -} : module); \ No newline at end of file +} : module); diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index 9efa3298a0..e2fcd216cc 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -91,4 +91,4 @@ define(function() { }; return module; -}); \ No newline at end of file +}); diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index ab0260ed96..be3defbb11 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -275,4 +275,4 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) { }; return module; -}); \ No newline at end of file +}); diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index a009e1ba66..5cbc4ca399 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -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 }; -}); \ No newline at end of file +}); diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js index c6f7aab854..648b3438b0 100644 --- a/public/src/modules/navigator.js +++ b/public/src/modules/navigator.js @@ -101,4 +101,4 @@ define(function() { } return navigator; -}); \ No newline at end of file +}); diff --git a/public/src/modules/notifications.js b/public/src/modules/notifications.js index cd9a9b7354..9987a5cedd 100644 --- a/public/src/modules/notifications.js +++ b/public/src/modules/notifications.js @@ -117,4 +117,4 @@ define(['sounds'], function(sound) { }; return Notifications; -}); \ No newline at end of file +}); diff --git a/public/src/modules/settings.js b/public/src/modules/settings.js index 129f4882d1..272060d537 100644 --- a/public/src/modules/settings.js +++ b/public/src/modules/settings.js @@ -65,4 +65,4 @@ define(function() { }; return Settings; -}); \ No newline at end of file +}); diff --git a/public/src/modules/share.js b/public/src/modules/share.js index bf32d8e4f8..0556367ff1 100644 --- a/public/src/modules/share.js +++ b/public/src/modules/share.js @@ -53,4 +53,4 @@ define(function() { } return module; -}); \ No newline at end of file +}); diff --git a/public/src/modules/sounds.js b/public/src/modules/sounds.js index ad79458f05..f12c86ed49 100644 --- a/public/src/modules/sounds.js +++ b/public/src/modules/sounds.js @@ -71,4 +71,4 @@ define(['buzz'], function(buzz) { }; return Sounds; -}); \ No newline at end of file +}); diff --git a/public/src/modules/string.js b/public/src/modules/string.js index d56334ffd7..83e283e934 100644 --- a/public/src/modules/string.js +++ b/public/src/modules/string.js @@ -1,3 +1,3 @@ /* string.js - Copyright (C) 2012-2013, JP Richardson -*/!function(){"use strict";function n(e,t){t!==null&&t!==undefined?typeof t=="string"?e.s=t:e.s=t.toString():e.s=t,e.orig=t,t!==null&&t!==undefined?e.__defineGetter__?e.__defineGetter__("length",function(){return e.s.length}):e.length=t.length:e.length=-1}function r(e){n(this,e)}function u(){for(var e in s)(function(e){var t=s[e];i.hasOwnProperty(e)||(o.push(e),i[e]=function(){return String.prototype.s=this,t.apply(this,arguments)})})(e)}function a(){for(var e=0;er?n.slice(s,i):"")},camelize:function(){var e=this.trim().s.replace(/(\-|_|\s)+(.)?/g,function(e,t,n){return n?n.toUpperCase():""});return new this.constructor(e)},capitalize:function(){return new this.constructor(this.s.substr(0,1).toUpperCase()+this.s.substring(1).toLowerCase())},charAt:function(e){return this.s.charAt(e)},chompLeft:function(e){var t=this.s;return t.indexOf(e)===0?(t=t.slice(e.length),new this.constructor(t)):this},chompRight:function(e){if(this.endsWith(e)){var t=this.s;return t=t.slice(0,t.length-e.length),new this.constructor(t)}return this},collapseWhitespace:function(){var e=this.s.replace(/[\s\xa0]+/g," ").replace(/^\s+|\s+$/g,"");return new this.constructor(e)},contains:function(e){return this.s.indexOf(e)>=0},count:function(e){var t=0,n=this.s.indexOf(e);while(n>=0)t+=1,n=this.s.indexOf(e,n+1);return t},dasherize:function(){var e=this.trim().s.replace(/[_\s]+/g,"-").replace(/([A-Z])/g,"-$1").replace(/-+/g,"-").toLowerCase();return new this.constructor(e)},decodeHtmlEntities:function(){var e=this.s;return e=e.replace(/&#(\d+);?/g,function(e,t){return String.fromCharCode(t)}).replace(/&#[xX]([A-Fa-f0-9]+);?/g,function(e,t){return String.fromCharCode(parseInt(t,16))}).replace(/&([^;\W]+;?)/g,function(e,n){var r=n.replace(/;$/,""),i=t[n]||n.match(/;$/)&&t[r];return typeof i=="number"?String.fromCharCode(i):typeof i=="string"?i:e}),new this.constructor(e)},endsWith:function(e){var t=this.s.length-e.length;return t>=0&&this.s.indexOf(e,t)===t},escapeHTML:function(){return new this.constructor(this.s.replace(/[&<>"']/g,function(e){return"&"+m[e]+";"}))},ensureLeft:function(e){var t=this.s;return t.indexOf(e)===0?this:new this.constructor(e+t)},ensureRight:function(e){var t=this.s;return this.endsWith(e)?this:new this.constructor(t+e)},humanize:function(){if(this.s===null||this.s===undefined)return new this.constructor("");var e=this.underscore().replace(/_id$/,"").replace(/_/g," ").trim().capitalize();return new this.constructor(e)},isAlpha:function(){return!/[^a-z\xC0-\xFF]/.test(this.s.toLowerCase())},isAlphaNumeric:function(){return!/[^0-9a-z\xC0-\xFF]/.test(this.s.toLowerCase())},isEmpty:function(){return this.s===null||this.s===undefined?!0:/^[\s\xa0]*$/.test(this.s)},isLower:function(){return this.isAlpha()&&this.s.toLowerCase()===this.s},isNumeric:function(){return!/[^0-9]/.test(this.s)},isUpper:function(){return this.isAlpha()&&this.s.toUpperCase()===this.s},left:function(e){if(e>=0){var t=this.s.substr(0,e);return new this.constructor(t)}return this.right(-e)},lines:function(){return this.replaceAll("\r\n","\n").s.split("\n")},pad:function(e,t){t==null&&(t=" ");if(this.s.length>=e)return new this.constructor(this.s);e-=this.s.length;var n=Array(Math.ceil(e/2)+1).join(t),r=Array(Math.floor(e/2)+1).join(t);return new this.constructor(n+this.s+r)},padLeft:function(e,t){return t==null&&(t=" "),this.s.length>=e?new this.constructor(this.s):new this.constructor(Array(e-this.s.length+1).join(t)+this.s)},padRight:function(e,t){return t==null&&(t=" "),this.s.length>=e?new this.constructor(this.s):new this.constructor(this.s+Array(e-this.s.length+1).join(t))},parseCSV:function(e,t,n,r){e=e||",",n=n||"\\",typeof t=="undefined"&&(t='"');var i=0,s=[],o=[],u=this.s.length,a=!1,f=this,l=function(e){return f.s.charAt(e)};if(typeof r!="undefined")var c=[];t||(a=!0);while(i=0){var t=this.s.substr(this.s.length-e,e);return new this.constructor(t)}return this.left(-e)},setValue:function(e){return n(this,e),this},slugify:function(){var e=(new r(this.s.replace(/[^\w\s-]/g,"").toLowerCase())).dasherize().s;return e.charAt(0)==="-"&&(e=e.substr(1)),new this.constructor(e)},startsWith:function(e){return this.s.lastIndexOf(e,0)===0},stripPunctuation:function(){return new this.constructor(this.s.replace(/[^\w\s]|_/g,"").replace(/\s+/g," "))},stripTags:function(){var e=this.s,t=arguments.length>0?arguments:[""];return d(t,function(t){e=e.replace(RegExp("]*>","gi"),"")}),new this.constructor(e)},template:function(e,t,n){var r=this.s,t=t||p.TMPL_OPEN,n=n||p.TMPL_CLOSE,i=t.replace(/[-[\]()*\s]/g,"\\$&").replace(/\$/g,"\\$"),s=n.replace(/[-[\]()*\s]/g,"\\$&").replace(/\$/g,"\\$"),o=new RegExp(i+"(.+?)"+s,"g"),u=r.match(o)||[];return u.forEach(function(i){var s=i.substring(t.length,i.length-n.length);typeof e[s]!="undefined"&&(r=r.replace(i,e[s]))}),new this.constructor(r)},times:function(e){return new this.constructor((new Array(e+1)).join(this.s))},toBoolean:function(){if(typeof this.orig=="string"){var e=this.s.toLowerCase();return e==="true"||e==="yes"||e==="on"}return this.orig===!0||this.orig===1},toFloat:function(e){var t=parseFloat(this.s);return e?parseFloat(t.toFixed(e)):t},toInt:function(){return/^\s*-?0x/i.test(this.s)?parseInt(this.s,16):parseInt(this.s,10)},trim:function(){var e;return typeof i.trim=="undefined"?e=this.s.replace(/(^\s*|\s*$)/g,""):e=this.s.trim(),new this.constructor(e)},trimLeft:function(){var e;return i.trimLeft?e=this.s.trimLeft():e=this.s.replace(/(^\s*)/g,""),new this.constructor(e)},trimRight:function(){var e;return i.trimRight?e=this.s.trimRight():e=this.s.replace(/\s+$/,""),new this.constructor(e)},truncate:function(e,t){var n=this.s;e=~~e,t=t||"...";if(n.length<=e)return new this.constructor(n);var i=function(e){return e.toUpperCase()!==e.toLowerCase()?"A":" "},s=n.slice(0,e+1).replace(/.(?=\W*\w*$)/g,i);return s.slice(s.length-2).match(/\w\w/)?s=s.replace(/\s*\S+$/,""):s=(new r(s.slice(0,s.length-1))).trimRight().s,(s+t).length>n.length?new r(n):new r(n.slice(0,s.length)+t)},toCSV:function(){function u(e){return e!==null&&e!==""}var e=",",t='"',n="\\",i=!0,s=!1,o=[];typeof arguments[0]=="object"?(e=arguments[0].delimiter||e,e=arguments[0].separator||e,t=arguments[0].qualifier||t,i=!!arguments[0].encloseNumbers,n=arguments[0].escape||n,s=!!arguments[0].keys):typeof arguments[0]=="string"&&(e=arguments[0]),typeof arguments[1]=="string"&&(t=arguments[1]),arguments[1]===null&&(t=null);if(this.orig instanceof Array)o=this.orig;else for(var a in this.orig)this.orig.hasOwnProperty(a)&&(s?o.push(a):o.push(this.orig[a]));var f=n+t,l=[];for(var c=0;c",quot:'"',apos:"'",amp:"&"},m={};for(var g in v)m[v[g]]=g;t={amp:"&",gt:">",lt:"<",quot:'"',apos:"'",AElig:198,Aacute:193,Acirc:194,Agrave:192,Aring:197,Atilde:195,Auml:196,Ccedil:199,ETH:208,Eacute:201,Ecirc:202,Egrave:200,Euml:203,Iacute:205,Icirc:206,Igrave:204,Iuml:207,Ntilde:209,Oacute:211,Ocirc:212,Ograve:210,Oslash:216,Otilde:213,Ouml:214,THORN:222,Uacute:218,Ucirc:219,Ugrave:217,Uuml:220,Yacute:221,aacute:225,acirc:226,aelig:230,agrave:224,aring:229,atilde:227,auml:228,ccedil:231,eacute:233,ecirc:234,egrave:232,eth:240,euml:235,iacute:237,icirc:238,igrave:236,iuml:239,ntilde:241,oacute:243,ocirc:244,ograve:242,oslash:248,otilde:245,ouml:246,szlig:223,thorn:254,uacute:250,ucirc:251,ugrave:249,uuml:252,yacute:253,yuml:255,copy:169,reg:174,nbsp:160,iexcl:161,cent:162,pound:163,curren:164,yen:165,brvbar:166,sect:167,uml:168,ordf:170,laquo:171,not:172,shy:173,macr:175,deg:176,plusmn:177,sup1:185,sup2:178,sup3:179,acute:180,micro:181,para:182,middot:183,cedil:184,ordm:186,raquo:187,frac14:188,frac12:189,frac34:190,iquest:191,times:215,divide:247,"OElig;":338,"oelig;":339,"Scaron;":352,"scaron;":353,"Yuml;":376,"fnof;":402,"circ;":710,"tilde;":732,"Alpha;":913,"Beta;":914,"Gamma;":915,"Delta;":916,"Epsilon;":917,"Zeta;":918,"Eta;":919,"Theta;":920,"Iota;":921,"Kappa;":922,"Lambda;":923,"Mu;":924,"Nu;":925,"Xi;":926,"Omicron;":927,"Pi;":928,"Rho;":929,"Sigma;":931,"Tau;":932,"Upsilon;":933,"Phi;":934,"Chi;":935,"Psi;":936,"Omega;":937,"alpha;":945,"beta;":946,"gamma;":947,"delta;":948,"epsilon;":949,"zeta;":950,"eta;":951,"theta;":952,"iota;":953,"kappa;":954,"lambda;":955,"mu;":956,"nu;":957,"xi;":958,"omicron;":959,"pi;":960,"rho;":961,"sigmaf;":962,"sigma;":963,"tau;":964,"upsilon;":965,"phi;":966,"chi;":967,"psi;":968,"omega;":969,"thetasym;":977,"upsih;":978,"piv;":982,"ensp;":8194,"emsp;":8195,"thinsp;":8201,"zwnj;":8204,"zwj;":8205,"lrm;":8206,"rlm;":8207,"ndash;":8211,"mdash;":8212,"lsquo;":8216,"rsquo;":8217,"sbquo;":8218,"ldquo;":8220,"rdquo;":8221,"bdquo;":8222,"dagger;":8224,"Dagger;":8225,"bull;":8226,"hellip;":8230,"permil;":8240,"prime;":8242,"Prime;":8243,"lsaquo;":8249,"rsaquo;":8250,"oline;":8254,"frasl;":8260,"euro;":8364,"image;":8465,"weierp;":8472,"real;":8476,"trade;":8482,"alefsym;":8501,"larr;":8592,"uarr;":8593,"rarr;":8594,"darr;":8595,"harr;":8596,"crarr;":8629,"lArr;":8656,"uArr;":8657,"rArr;":8658,"dArr;":8659,"hArr;":8660,"forall;":8704,"part;":8706,"exist;":8707,"empty;":8709,"nabla;":8711,"isin;":8712,"notin;":8713,"ni;":8715,"prod;":8719,"sum;":8721,"minus;":8722,"lowast;":8727,"radic;":8730,"prop;":8733,"infin;":8734,"ang;":8736,"and;":8743,"or;":8744,"cap;":8745,"cup;":8746,"int;":8747,"there4;":8756,"sim;":8764,"cong;":8773,"asymp;":8776,"ne;":8800,"equiv;":8801,"le;":8804,"ge;":8805,"sub;":8834,"sup;":8835,"nsub;":8836,"sube;":8838,"supe;":8839,"oplus;":8853,"otimes;":8855,"perp;":8869,"sdot;":8901,"lceil;":8968,"rceil;":8969,"lfloor;":8970,"rfloor;":8971,"lang;":9001,"rang;":9002,"loz;":9674,"spades;":9824,"clubs;":9827,"hearts;":9829,"diams;":9830}}.call(this); \ No newline at end of file +*/!function(){"use strict";function n(e,t){t!==null&&t!==undefined?typeof t=="string"?e.s=t:e.s=t.toString():e.s=t,e.orig=t,t!==null&&t!==undefined?e.__defineGetter__?e.__defineGetter__("length",function(){return e.s.length}):e.length=t.length:e.length=-1}function r(e){n(this,e)}function u(){for(var e in s)(function(e){var t=s[e];i.hasOwnProperty(e)||(o.push(e),i[e]=function(){return String.prototype.s=this,t.apply(this,arguments)})})(e)}function a(){for(var e=0;er?n.slice(s,i):"")},camelize:function(){var e=this.trim().s.replace(/(\-|_|\s)+(.)?/g,function(e,t,n){return n?n.toUpperCase():""});return new this.constructor(e)},capitalize:function(){return new this.constructor(this.s.substr(0,1).toUpperCase()+this.s.substring(1).toLowerCase())},charAt:function(e){return this.s.charAt(e)},chompLeft:function(e){var t=this.s;return t.indexOf(e)===0?(t=t.slice(e.length),new this.constructor(t)):this},chompRight:function(e){if(this.endsWith(e)){var t=this.s;return t=t.slice(0,t.length-e.length),new this.constructor(t)}return this},collapseWhitespace:function(){var e=this.s.replace(/[\s\xa0]+/g," ").replace(/^\s+|\s+$/g,"");return new this.constructor(e)},contains:function(e){return this.s.indexOf(e)>=0},count:function(e){var t=0,n=this.s.indexOf(e);while(n>=0)t+=1,n=this.s.indexOf(e,n+1);return t},dasherize:function(){var e=this.trim().s.replace(/[_\s]+/g,"-").replace(/([A-Z])/g,"-$1").replace(/-+/g,"-").toLowerCase();return new this.constructor(e)},decodeHtmlEntities:function(){var e=this.s;return e=e.replace(/&#(\d+);?/g,function(e,t){return String.fromCharCode(t)}).replace(/&#[xX]([A-Fa-f0-9]+);?/g,function(e,t){return String.fromCharCode(parseInt(t,16))}).replace(/&([^;\W]+;?)/g,function(e,n){var r=n.replace(/;$/,""),i=t[n]||n.match(/;$/)&&t[r];return typeof i=="number"?String.fromCharCode(i):typeof i=="string"?i:e}),new this.constructor(e)},endsWith:function(e){var t=this.s.length-e.length;return t>=0&&this.s.indexOf(e,t)===t},escapeHTML:function(){return new this.constructor(this.s.replace(/[&<>"']/g,function(e){return"&"+m[e]+";"}))},ensureLeft:function(e){var t=this.s;return t.indexOf(e)===0?this:new this.constructor(e+t)},ensureRight:function(e){var t=this.s;return this.endsWith(e)?this:new this.constructor(t+e)},humanize:function(){if(this.s===null||this.s===undefined)return new this.constructor("");var e=this.underscore().replace(/_id$/,"").replace(/_/g," ").trim().capitalize();return new this.constructor(e)},isAlpha:function(){return!/[^a-z\xC0-\xFF]/.test(this.s.toLowerCase())},isAlphaNumeric:function(){return!/[^0-9a-z\xC0-\xFF]/.test(this.s.toLowerCase())},isEmpty:function(){return this.s===null||this.s===undefined?!0:/^[\s\xa0]*$/.test(this.s)},isLower:function(){return this.isAlpha()&&this.s.toLowerCase()===this.s},isNumeric:function(){return!/[^0-9]/.test(this.s)},isUpper:function(){return this.isAlpha()&&this.s.toUpperCase()===this.s},left:function(e){if(e>=0){var t=this.s.substr(0,e);return new this.constructor(t)}return this.right(-e)},lines:function(){return this.replaceAll("\r\n","\n").s.split("\n")},pad:function(e,t){t==null&&(t=" ");if(this.s.length>=e)return new this.constructor(this.s);e-=this.s.length;var n=Array(Math.ceil(e/2)+1).join(t),r=Array(Math.floor(e/2)+1).join(t);return new this.constructor(n+this.s+r)},padLeft:function(e,t){return t==null&&(t=" "),this.s.length>=e?new this.constructor(this.s):new this.constructor(Array(e-this.s.length+1).join(t)+this.s)},padRight:function(e,t){return t==null&&(t=" "),this.s.length>=e?new this.constructor(this.s):new this.constructor(this.s+Array(e-this.s.length+1).join(t))},parseCSV:function(e,t,n,r){e=e||",",n=n||"\\",typeof t=="undefined"&&(t='"');var i=0,s=[],o=[],u=this.s.length,a=!1,f=this,l=function(e){return f.s.charAt(e)};if(typeof r!="undefined")var c=[];t||(a=!0);while(i=0){var t=this.s.substr(this.s.length-e,e);return new this.constructor(t)}return this.left(-e)},setValue:function(e){return n(this,e),this},slugify:function(){var e=(new r(this.s.replace(/[^\w\s-]/g,"").toLowerCase())).dasherize().s;return e.charAt(0)==="-"&&(e=e.substr(1)),new this.constructor(e)},startsWith:function(e){return this.s.lastIndexOf(e,0)===0},stripPunctuation:function(){return new this.constructor(this.s.replace(/[^\w\s]|_/g,"").replace(/\s+/g," "))},stripTags:function(){var e=this.s,t=arguments.length>0?arguments:[""];return d(t,function(t){e=e.replace(RegExp("]*>","gi"),"")}),new this.constructor(e)},template:function(e,t,n){var r=this.s,t=t||p.TMPL_OPEN,n=n||p.TMPL_CLOSE,i=t.replace(/[-[\]()*\s]/g,"\\$&").replace(/\$/g,"\\$"),s=n.replace(/[-[\]()*\s]/g,"\\$&").replace(/\$/g,"\\$"),o=new RegExp(i+"(.+?)"+s,"g"),u=r.match(o)||[];return u.forEach(function(i){var s=i.substring(t.length,i.length-n.length);typeof e[s]!="undefined"&&(r=r.replace(i,e[s]))}),new this.constructor(r)},times:function(e){return new this.constructor((new Array(e+1)).join(this.s))},toBoolean:function(){if(typeof this.orig=="string"){var e=this.s.toLowerCase();return e==="true"||e==="yes"||e==="on"}return this.orig===!0||this.orig===1},toFloat:function(e){var t=parseFloat(this.s);return e?parseFloat(t.toFixed(e)):t},toInt:function(){return/^\s*-?0x/i.test(this.s)?parseInt(this.s,16):parseInt(this.s,10)},trim:function(){var e;return typeof i.trim=="undefined"?e=this.s.replace(/(^\s*|\s*$)/g,""):e=this.s.trim(),new this.constructor(e)},trimLeft:function(){var e;return i.trimLeft?e=this.s.trimLeft():e=this.s.replace(/(^\s*)/g,""),new this.constructor(e)},trimRight:function(){var e;return i.trimRight?e=this.s.trimRight():e=this.s.replace(/\s+$/,""),new this.constructor(e)},truncate:function(e,t){var n=this.s;e=~~e,t=t||"...";if(n.length<=e)return new this.constructor(n);var i=function(e){return e.toUpperCase()!==e.toLowerCase()?"A":" "},s=n.slice(0,e+1).replace(/.(?=\W*\w*$)/g,i);return s.slice(s.length-2).match(/\w\w/)?s=s.replace(/\s*\S+$/,""):s=(new r(s.slice(0,s.length-1))).trimRight().s,(s+t).length>n.length?new r(n):new r(n.slice(0,s.length)+t)},toCSV:function(){function u(e){return e!==null&&e!==""}var e=",",t='"',n="\\",i=!0,s=!1,o=[];typeof arguments[0]=="object"?(e=arguments[0].delimiter||e,e=arguments[0].separator||e,t=arguments[0].qualifier||t,i=!!arguments[0].encloseNumbers,n=arguments[0].escape||n,s=!!arguments[0].keys):typeof arguments[0]=="string"&&(e=arguments[0]),typeof arguments[1]=="string"&&(t=arguments[1]),arguments[1]===null&&(t=null);if(this.orig instanceof Array)o=this.orig;else for(var a in this.orig)this.orig.hasOwnProperty(a)&&(s?o.push(a):o.push(this.orig[a]));var f=n+t,l=[];for(var c=0;c",quot:'"',apos:"'",amp:"&"},m={};for(var g in v)m[v[g]]=g;t={amp:"&",gt:">",lt:"<",quot:'"',apos:"'",AElig:198,Aacute:193,Acirc:194,Agrave:192,Aring:197,Atilde:195,Auml:196,Ccedil:199,ETH:208,Eacute:201,Ecirc:202,Egrave:200,Euml:203,Iacute:205,Icirc:206,Igrave:204,Iuml:207,Ntilde:209,Oacute:211,Ocirc:212,Ograve:210,Oslash:216,Otilde:213,Ouml:214,THORN:222,Uacute:218,Ucirc:219,Ugrave:217,Uuml:220,Yacute:221,aacute:225,acirc:226,aelig:230,agrave:224,aring:229,atilde:227,auml:228,ccedil:231,eacute:233,ecirc:234,egrave:232,eth:240,euml:235,iacute:237,icirc:238,igrave:236,iuml:239,ntilde:241,oacute:243,ocirc:244,ograve:242,oslash:248,otilde:245,ouml:246,szlig:223,thorn:254,uacute:250,ucirc:251,ugrave:249,uuml:252,yacute:253,yuml:255,copy:169,reg:174,nbsp:160,iexcl:161,cent:162,pound:163,curren:164,yen:165,brvbar:166,sect:167,uml:168,ordf:170,laquo:171,not:172,shy:173,macr:175,deg:176,plusmn:177,sup1:185,sup2:178,sup3:179,acute:180,micro:181,para:182,middot:183,cedil:184,ordm:186,raquo:187,frac14:188,frac12:189,frac34:190,iquest:191,times:215,divide:247,"OElig;":338,"oelig;":339,"Scaron;":352,"scaron;":353,"Yuml;":376,"fnof;":402,"circ;":710,"tilde;":732,"Alpha;":913,"Beta;":914,"Gamma;":915,"Delta;":916,"Epsilon;":917,"Zeta;":918,"Eta;":919,"Theta;":920,"Iota;":921,"Kappa;":922,"Lambda;":923,"Mu;":924,"Nu;":925,"Xi;":926,"Omicron;":927,"Pi;":928,"Rho;":929,"Sigma;":931,"Tau;":932,"Upsilon;":933,"Phi;":934,"Chi;":935,"Psi;":936,"Omega;":937,"alpha;":945,"beta;":946,"gamma;":947,"delta;":948,"epsilon;":949,"zeta;":950,"eta;":951,"theta;":952,"iota;":953,"kappa;":954,"lambda;":955,"mu;":956,"nu;":957,"xi;":958,"omicron;":959,"pi;":960,"rho;":961,"sigmaf;":962,"sigma;":963,"tau;":964,"upsilon;":965,"phi;":966,"chi;":967,"psi;":968,"omega;":969,"thetasym;":977,"upsih;":978,"piv;":982,"ensp;":8194,"emsp;":8195,"thinsp;":8201,"zwnj;":8204,"zwj;":8205,"lrm;":8206,"rlm;":8207,"ndash;":8211,"mdash;":8212,"lsquo;":8216,"rsquo;":8217,"sbquo;":8218,"ldquo;":8220,"rdquo;":8221,"bdquo;":8222,"dagger;":8224,"Dagger;":8225,"bull;":8226,"hellip;":8230,"permil;":8240,"prime;":8242,"Prime;":8243,"lsaquo;":8249,"rsaquo;":8250,"oline;":8254,"frasl;":8260,"euro;":8364,"image;":8465,"weierp;":8472,"real;":8476,"trade;":8482,"alefsym;":8501,"larr;":8592,"uarr;":8593,"rarr;":8594,"darr;":8595,"harr;":8596,"crarr;":8629,"lArr;":8656,"uArr;":8657,"rArr;":8658,"dArr;":8659,"hArr;":8660,"forall;":8704,"part;":8706,"exist;":8707,"empty;":8709,"nabla;":8711,"isin;":8712,"notin;":8713,"ni;":8715,"prod;":8719,"sum;":8721,"minus;":8722,"lowast;":8727,"radic;":8730,"prop;":8733,"infin;":8734,"ang;":8736,"and;":8743,"or;":8744,"cap;":8745,"cup;":8746,"int;":8747,"there4;":8756,"sim;":8764,"cong;":8773,"asymp;":8776,"ne;":8800,"equiv;":8801,"le;":8804,"ge;":8805,"sub;":8834,"sup;":8835,"nsub;":8836,"sube;":8838,"supe;":8839,"oplus;":8853,"otimes;":8855,"perp;":8869,"sdot;":8901,"lceil;":8968,"rceil;":8969,"lfloor;":8970,"rfloor;":8971,"lang;":9001,"rang;":9002,"loz;":9674,"spades;":9824,"clubs;":9827,"hearts;":9829,"diams;":9830}}.call(this); diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js index a4397901e2..3f7ac91ed5 100644 --- a/public/src/modules/taskbar.js +++ b/public/src/modules/taskbar.js @@ -110,4 +110,4 @@ define(function() { toggleNew: taskbar.toggleNew, updateActive: taskbar.updateActive } -}); \ No newline at end of file +}); diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js index fe9715e4d0..a34ce0b08c 100644 --- a/public/src/modules/uploader.js +++ b/public/src/modules/uploader.js @@ -100,4 +100,4 @@ define(function() { }; return module; -}); \ No newline at end of file +}); diff --git a/public/src/overrides.js b/public/src/overrides.js index fe29fdf80e..e77371fa71 100644 --- a/public/src/overrides.js +++ b/public/src/overrides.js @@ -73,4 +73,4 @@ if ('undefined' !== typeof window) { e.button === 2 || _clearMenus(); }); -} \ No newline at end of file +} diff --git a/public/src/templates.js b/public/src/templates.js index 368c80a277..cde5353824 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -322,4 +322,4 @@ module: { exports: {} } -} : module); \ No newline at end of file +} : module); diff --git a/public/src/translator.js b/public/src/translator.js index b1b2219593..ba6350ff59 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -232,4 +232,4 @@ module: { exports: {} } -} : module); \ No newline at end of file +} : module); diff --git a/public/src/utils.js b/public/src/utils.js index 15ae1c6e63..9e733f8234 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -274,4 +274,4 @@ module: { exports: {} } -} : module); \ No newline at end of file +} : module); diff --git a/public/src/variables.js b/public/src/variables.js index 20810a3ecb..0473499176 100644 --- a/public/src/variables.js +++ b/public/src/variables.js @@ -38,4 +38,4 @@ ajaxify.variables.set($(element).attr('template-variable'), value); }); }; -}(ajaxify || {})); \ No newline at end of file +}(ajaxify || {})); diff --git a/public/src/widgets.js b/public/src/widgets.js index 47dffea3ce..62a9b15aaa 100644 --- a/public/src/widgets.js +++ b/public/src/widgets.js @@ -79,4 +79,4 @@ checkCallback(); }; -}(ajaxify || {})); \ No newline at end of file +}(ajaxify || {})); diff --git a/src/categories.js b/src/categories.js index 409e8e7aeb..11c86e81fd 100644 --- a/src/categories.js +++ b/src/categories.js @@ -324,4 +324,4 @@ var db = require('./database'), emitter.on('event:newpost', Categories.onNewPostMade); -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/categories/activeusers.js b/src/categories/activeusers.js index 7fd86651aa..418b891aa9 100644 --- a/src/categories/activeusers.js +++ b/src/categories/activeusers.js @@ -80,4 +80,4 @@ module.exports = function(Categories) { } }); }; -}; \ No newline at end of file +}; diff --git a/src/categories/update.js b/src/categories/update.js index d52bd6904e..002628d723 100644 --- a/src/categories/update.js +++ b/src/categories/update.js @@ -43,4 +43,4 @@ module.exports = function(Categories) { }); }; -}; \ No newline at end of file +}; diff --git a/src/categoryTools.js b/src/categoryTools.js index ee41c85a8a..d07f5007de 100644 --- a/src/categoryTools.js +++ b/src/categoryTools.js @@ -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) { diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 3be58c7b62..97678b4963 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -468,4 +468,4 @@ accountsController.getNotifications = function(req, res, next) { }); }; -module.exports = accountsController; \ No newline at end of file +module.exports = accountsController; diff --git a/src/controllers/admin.js b/src/controllers/admin.js index a4954c4946..41e8618344 100644 --- a/src/controllers/admin.js +++ b/src/controllers/admin.js @@ -169,4 +169,4 @@ adminController.sounds.get = function(req, res, next) { }); }; -module.exports = adminController; \ No newline at end of file +module.exports = adminController; diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js index c2bb41fb80..1d68d993c7 100644 --- a/src/controllers/admin/users.js +++ b/src/controllers/admin/users.js @@ -47,4 +47,4 @@ usersController.getCSV = function(req, res, next) { }); }; -module.exports = usersController; \ No newline at end of file +module.exports = usersController; diff --git a/src/controllers/api.js b/src/controllers/api.js index 6f1f7042a6..ef95ad8ebe 100644 --- a/src/controllers/api.js +++ b/src/controllers/api.js @@ -70,4 +70,4 @@ apiController.getConfig = function(req, res, next) { }; -module.exports = apiController; \ No newline at end of file +module.exports = apiController; diff --git a/src/controllers/index.js b/src/controllers/index.js index b78e05bb2b..eb0af56d65 100644 --- a/src/controllers/index.js +++ b/src/controllers/index.js @@ -266,4 +266,4 @@ Controllers.outgoing = function(req, res, next) { } }; -module.exports = Controllers; \ No newline at end of file +module.exports = Controllers; diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 5fdf606d47..19fa9e66a9 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -181,4 +181,4 @@ topicsController.get = function(req, res, next) { }); }; -module.exports = topicsController; \ No newline at end of file +module.exports = topicsController; diff --git a/src/controllers/users.js b/src/controllers/users.js index 4d97298c40..bd8687a809 100644 --- a/src/controllers/users.js +++ b/src/controllers/users.js @@ -100,4 +100,4 @@ usersController.getUsersForSearch = function(req, res, next) { -module.exports = usersController; \ No newline at end of file +module.exports = usersController; diff --git a/src/emailer.js b/src/emailer.js index 1e008c8a24..5576e2a73c 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -50,4 +50,4 @@ Emailer.send = function(template, uid, params) { }); }; -module.exports = Emailer; \ No newline at end of file +module.exports = Emailer; diff --git a/src/emitter.js b/src/emitter.js index 0ce9395048..2d076613be 100644 --- a/src/emitter.js +++ b/src/emitter.js @@ -1,4 +1,4 @@ var events = require('events'), eventEmitter = new events.EventEmitter(); -module.exports = eventEmitter; \ No newline at end of file +module.exports = eventEmitter; diff --git a/src/events.js b/src/events.js index 05d6e2cee5..64b76fdfdd 100644 --- a/src/events.js +++ b/src/events.js @@ -113,4 +113,4 @@ var fs = require('fs'), }); }; -}(module.exports)); \ No newline at end of file +}(module.exports)); diff --git a/src/favourites.js b/src/favourites.js index 11465ff6a5..b92d6ceea6 100644 --- a/src/favourites.js +++ b/src/favourites.js @@ -217,4 +217,4 @@ var async = require('async'), }, callback); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/image.js b/src/image.js index 49160dd45a..7539840fde 100644 --- a/src/image.js +++ b/src/image.js @@ -44,4 +44,4 @@ image.convertImageToBase64 = function(path, callback) { }); }; -module.exports = image; \ No newline at end of file +module.exports = image; diff --git a/src/install.js b/src/install.js index 97cc2260db..9666ec0a70 100644 --- a/src/install.js +++ b/src/install.js @@ -429,4 +429,4 @@ install.save = function (server_conf, callback) { }); }; -module.exports = install; \ No newline at end of file +module.exports = install; diff --git a/src/languages.js b/src/languages.js index 6980ce1e85..679916dcf0 100644 --- a/src/languages.js +++ b/src/languages.js @@ -42,4 +42,4 @@ Languages.list = function(callback) { }); }; -module.exports = Languages; \ No newline at end of file +module.exports = Languages; diff --git a/src/messaging.js b/src/messaging.js index 7624b07286..03beb8b34e 100644 --- a/src/messaging.js +++ b/src/messaging.js @@ -147,4 +147,4 @@ var db = require('./database'), }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/middleware/admin.js b/src/middleware/admin.js index a9fb9d8148..03ee4ed054 100644 --- a/src/middleware/admin.js +++ b/src/middleware/admin.js @@ -89,4 +89,4 @@ middleware.buildHeader = function(req, res, next) { module.exports = function(webserver) { app = webserver; return middleware; -}; \ No newline at end of file +}; diff --git a/src/middleware/index.js b/src/middleware/index.js index 530dab5635..8cec1b06f5 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -217,4 +217,4 @@ module.exports = function(app, data) { }); return middleware; -}; \ No newline at end of file +}; diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index 948806572e..a9bf08ea10 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -345,4 +345,4 @@ module.exports = function(webserver) { middleware.admin = require('./admin')(webserver); return middleware; -}; \ No newline at end of file +}; diff --git a/src/plugins.js b/src/plugins.js index d915d347ab..16e421ce62 100644 --- a/src/plugins.js +++ b/src/plugins.js @@ -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 = []; diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 2728f58116..604acd0440 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -214,4 +214,4 @@ uid: uid }); }); -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/routes/debug.js b/src/routes/debug.js index 5198dbd3dc..6c03961251 100644 --- a/src/routes/debug.js +++ b/src/routes/debug.js @@ -58,4 +58,4 @@ module.exports = function(app, middleware, controllers) { res.send(200); }); }); -}; \ No newline at end of file +}; diff --git a/src/routes/feeds.js b/src/routes/feeds.js index da04a67889..65b543f5ca 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -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); -}; \ No newline at end of file +}; diff --git a/src/routes/index.js b/src/routes/index.js index 1f89c6d4a9..aef5c28b37 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -152,4 +152,4 @@ module.exports = function(app, middleware) { require('./debug')(app, middleware, controllers); } }); -}; \ No newline at end of file +}; diff --git a/src/routes/plugins.js b/src/routes/plugins.js index 2108ee83fa..334ad3fbbf 100644 --- a/src/routes/plugins.js +++ b/src/routes/plugins.js @@ -51,4 +51,4 @@ module.exports = function(app, middleware, controllers) { res.redirect('/404'); } }); -}; \ No newline at end of file +}; diff --git a/src/sitemap.js b/src/sitemap.js index 56db3b1b2c..8b3c7d6bf6 100644 --- a/src/sitemap.js +++ b/src/sitemap.js @@ -88,4 +88,4 @@ var path = require('path'), } }; -module.exports = sitemap; \ No newline at end of file +module.exports = sitemap; diff --git a/src/socket.io/categories.js b/src/socket.io/categories.js index eaa6eb0966..80af126f29 100644 --- a/src/socket.io/categories.js +++ b/src/socket.io/categories.js @@ -47,4 +47,4 @@ SocketCategories.getTopicCount = function(socket, cid, callback) { categories.getCategoryField(cid, 'topic_count', callback); }; -module.exports = SocketCategories; \ No newline at end of file +module.exports = SocketCategories; diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 713951cfea..60e1d4e035 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -319,4 +319,4 @@ function emitOnlineUserCount(callback) { /* Exporting */ -module.exports = Sockets; \ No newline at end of file +module.exports = Sockets; diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index e583b9ad21..a34fda885a 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -111,4 +111,4 @@ SocketMeta.rooms.getAll = function(socket, data, callback) { /* Exports */ -module.exports = SocketMeta; \ No newline at end of file +module.exports = SocketMeta; diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js index e8952ff9a1..16ec594678 100644 --- a/src/socket.io/modules.js +++ b/src/socket.io/modules.js @@ -231,4 +231,4 @@ SocketModules.sounds.getMapping = function(socket, data, callback) { meta.sounds.getMapping(callback); }; -module.exports = SocketModules; \ No newline at end of file +module.exports = SocketModules; diff --git a/src/socket.io/notifications.js b/src/socket.io/notifications.js index 3c41f33d5d..fd9204f08f 100644 --- a/src/socket.io/notifications.js +++ b/src/socket.io/notifications.js @@ -12,4 +12,4 @@ SocketNotifs.getCount = function(socket, data, callback) { user.notifications.getUnreadCount(socket.uid, callback); }; -module.exports = SocketNotifs; \ No newline at end of file +module.exports = SocketNotifs; diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index 8383f58f82..f2144896cd 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -318,4 +318,4 @@ SocketPosts.getCategory = function(socket, pid, callback) { posts.getCidByPid(pid, callback); }; -module.exports = SocketPosts; \ No newline at end of file +module.exports = SocketPosts; diff --git a/src/socket.io/tools.js b/src/socket.io/tools.js index a4907b2e7d..4aace7cfef 100644 --- a/src/socket.io/tools.js +++ b/src/socket.io/tools.js @@ -6,4 +6,4 @@ SocketTools.log = function(socket, data, callback) { //winston.info("captured console.log:", data) }; -module.exports = SocketTools; \ No newline at end of file +module.exports = SocketTools; diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 1736a7c7ab..17e2ef3684 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -313,4 +313,4 @@ SocketTopics.getTidIndex = function(socket, tid, callback) { categories.getTopicIndex(tid, callback); }; -module.exports = SocketTopics; \ No newline at end of file +module.exports = SocketTopics; diff --git a/src/socket.io/user.js b/src/socket.io/user.js index ce78fe9976..4c564c18c9 100644 --- a/src/socket.io/user.js +++ b/src/socket.io/user.js @@ -248,4 +248,4 @@ SocketUser.setStatus = function(socket, status, callback) { /* Exports */ -module.exports = SocketUser; \ No newline at end of file +module.exports = SocketUser; diff --git a/src/socket.io/widgets.js b/src/socket.io/widgets.js index 6347cc249a..914cb0bc86 100644 --- a/src/socket.io/widgets.js +++ b/src/socket.io/widgets.js @@ -8,4 +8,4 @@ SocketWidgets.render = function(socket, data, callback) { widgets.render(socket.uid, data, callback); }; -module.exports = SocketWidgets; \ No newline at end of file +module.exports = SocketWidgets; diff --git a/src/threadTools.js b/src/threadTools.js index 7e7c8e509b..565bf93ec6 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -293,4 +293,4 @@ var winston = require('winston'), }); }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/topics.js b/src/topics.js index a5cbd0b69b..e4accc9250 100644 --- a/src/topics.js +++ b/src/topics.js @@ -478,4 +478,4 @@ var async = require('async'), }); }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/topics/create.js b/src/topics/create.js index b6aac66077..f597b53d7d 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -219,4 +219,4 @@ module.exports = function(Topics) { ], callback); }; -}; \ No newline at end of file +}; diff --git a/src/topics/fork.js b/src/topics/fork.js index 005b137058..f935132d81 100644 --- a/src/topics/fork.js +++ b/src/topics/fork.js @@ -99,4 +99,4 @@ module.exports = function(Topics) { }); }); }; -}; \ No newline at end of file +}; diff --git a/src/topics/unread.js b/src/topics/unread.js index e6f0cb389c..b6d7460d12 100644 --- a/src/topics/unread.js +++ b/src/topics/unread.js @@ -223,4 +223,4 @@ module.exports = function(Topics) { }; -}; \ No newline at end of file +}; diff --git a/src/upgrade.js b/src/upgrade.js index ef1f820876..cd364b3843 100644 --- a/src/upgrade.js +++ b/src/upgrade.js @@ -628,4 +628,4 @@ Upgrade.upgrade = function(callback) { }); }; -module.exports = Upgrade; \ No newline at end of file +module.exports = Upgrade; diff --git a/src/user/create.js b/src/user/create.js index f8f95b0878..3bbfe9e9c7 100644 --- a/src/user/create.js +++ b/src/user/create.js @@ -141,4 +141,4 @@ module.exports = function(User) { }); }); }; -}; \ No newline at end of file +}; diff --git a/src/user/follow.js b/src/user/follow.js index 1944e9534f..e9b597e6e5 100644 --- a/src/user/follow.js +++ b/src/user/follow.js @@ -65,4 +65,4 @@ module.exports = function(User) { db.isSetMember('following:' + uid, theirid, callback); }; -}; \ No newline at end of file +}; diff --git a/src/user/notifications.js b/src/user/notifications.js index 3b4542a787..9ac5b820c6 100644 --- a/src/user/notifications.js +++ b/src/user/notifications.js @@ -180,4 +180,4 @@ var async = require('async'), }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/user/profile.js b/src/user/profile.js index 8620dde36e..f830061f6e 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -253,4 +253,4 @@ module.exports = function(User) { } }; -}; \ No newline at end of file +}; diff --git a/src/user/reset.js b/src/user/reset.js index 7e3b2d75c8..2ceceaef02 100644 --- a/src/user/reset.js +++ b/src/user/reset.js @@ -89,4 +89,4 @@ var async = require('async'), }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/src/user/search.js b/src/user/search.js index 90a17cb521..c014435a97 100644 --- a/src/user/search.js +++ b/src/user/search.js @@ -41,4 +41,3 @@ module.exports = function(User) { }); }; }; - diff --git a/src/user/settings.js b/src/user/settings.js index 35ca90717d..ab80e4fb42 100644 --- a/src/user/settings.js +++ b/src/user/settings.js @@ -52,4 +52,4 @@ module.exports = function(User) { language: data.language || meta.config.defaultLang }, callback); }; -}; \ No newline at end of file +}; diff --git a/src/widgets.js b/src/widgets.js index 65bf0cba74..f55598df4c 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -99,4 +99,4 @@ var async = require('async'), }); }; -}(exports)); \ No newline at end of file +}(exports)); diff --git a/tests/groups.js b/tests/groups.js index ed7c8f3b8c..96d98eeaeb 100644 --- a/tests/groups.js +++ b/tests/groups.js @@ -285,4 +285,4 @@ describe('Groups', function() { }); }); }); -}); \ No newline at end of file +}); diff --git a/tests/topics.js b/tests/topics.js index c28456fdbc..5433ab3746 100644 --- a/tests/topics.js +++ b/tests/topics.js @@ -77,4 +77,4 @@ describe('Topic\'s', function() { after(function() { db.flushdb(); }); -}); \ No newline at end of file +}); diff --git a/tests/user.js b/tests/user.js index 5da9412802..fe9f21d941 100644 --- a/tests/user.js +++ b/tests/user.js @@ -45,4 +45,4 @@ describe('User', function() { after(function() { db.flushdb(); }); -}); \ No newline at end of file +});