' + data.onlineRegisteredCount + '
' +
'Users
' +
'' +
'' +
- '
' +
''+ data.onlineGuestCount +'
' +
+ '' + data.onlineGuestCount + '
' +
'Guests
' +
'' +
- '
' +
''+ (data.onlineRegisteredCount + data.onlineGuestCount) +'
' +
+ '' + (data.onlineRegisteredCount + data.onlineGuestCount) + '
' +
'Total
' +
'' +
- '
';
@@ -150,7 +150,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
if (g > 255) g = 255;
else if (g < 0) g = 0;
- return (usePound?"#":"") + (g | (b << 8) | (r << 16)).toString(16);
+ return (usePound ? "#" : "") + (g | (b << 8) | (r << 16)).toString(16);
}
function setupGraphs() {
@@ -272,12 +272,12 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
$(window).on('resize', adjustPieCharts);
adjustPieCharts();
- $('[data-action="updateGraph"]').on('click', function() {
+ $('[data-action="updateGraph"]').on('click', function () {
var until = undefined;
switch($(this).attr('data-until')) {
case 'last-month':
var lastMonth = new Date();
- lastMonth.setDate(lastMonth.getDate()-30);
+ lastMonth.setDate(lastMonth.getDate() - 30);
until = lastMonth.getTime();
}
updateTrafficGraph($(this).attr('data-units'), until);
@@ -285,7 +285,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
}
function adjustPieCharts() {
- $('.pie-chart.legend-up').each(function() {
+ $('.pie-chart.legend-up').each(function () {
var $this = $(this);
if ($this.width() < 320) {
@@ -396,7 +396,7 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
}
function setupRealtimeButton() {
- $('#toggle-realtime .fa').on('click', function() {
+ $('#toggle-realtime .fa').on('click', function () {
var $this = $(this);
if ($this.hasClass('fa-toggle-on')) {
$this.removeClass('fa-toggle-on').addClass('fa-toggle-off');
@@ -414,13 +414,13 @@ define('admin/general/dashboard', ['semver', 'Chart'], function(semver, Chart) {
clearInterval(intervals.rooms);
clearInterval(intervals.graphs);
- intervals.rooms = setInterval(function() {
+ intervals.rooms = setInterval(function () {
if (app.isFocused && app.isConnected) {
socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
}
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.roomInterval);
- intervals.graphs = setInterval(function() {
+ intervals.graphs = setInterval(function () {
updateTrafficGraph(currentGraph.units, currentGraph.until);
}, realtime ? DEFAULTS.realtimeInterval : DEFAULTS.graphInterval);
}
diff --git a/public/src/admin/general/homepage.js b/public/src/admin/general/homepage.js
index 96a6aac0eb..f0239e784c 100644
--- a/public/src/admin/general/homepage.js
+++ b/public/src/admin/general/homepage.js
@@ -1,7 +1,7 @@
"use strict";
/*global define*/
-define('admin/general/homepage', ['admin/settings'], function(Settings) {
+define('admin/general/homepage', ['admin/settings'], function (Settings) {
function toggleCustomRoute() {
if ($('[data-field="homePageRoute"]').val()) {
@@ -13,7 +13,7 @@ define('admin/general/homepage', ['admin/settings'], function(Settings) {
var Homepage = {};
- Homepage.init = function() {
+ Homepage.init = function () {
$('[data-field="homePageRoute"]').on('change', toggleCustomRoute);
toggleCustomRoute();
diff --git a/public/src/admin/general/languages.js b/public/src/admin/general/languages.js
index 24d6a418c9..7d597ffc46 100644
--- a/public/src/admin/general/languages.js
+++ b/public/src/admin/general/languages.js
@@ -1,10 +1,10 @@
"use strict";
/*global define*/
-define('admin/general/languages', ['admin/settings'], function(Settings) {
+define('admin/general/languages', ['admin/settings'], function (Settings) {
var Languages = {}
- Languages.init = function() {
+ Languages.init = function () {
Settings.prepare();
};
diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index 1837fc590f..35ca62e094 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -1,18 +1,18 @@
"use strict";
/* global define, app, ajaxify, socket, templates */
-define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function(translator, iconSelect, jqueryui) {
+define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], function (translator, iconSelect, jqueryui) {
var navigation = {},
available;
- navigation.init = function() {
+ navigation.init = function () {
available = ajaxify.data.available;
- $('#enabled .unescape').each(function() {
+ $('#enabled .unescape').each(function () {
$(this).val(translator.unescape($(this).val()));
});
- translator.translate(translator.unescape($('#available').html()), function(html) {
+ translator.translate(translator.unescape($('#available').html()), function (html) {
$('#available').html(html)
.find('li .drag-item').draggable({
connectToSortable: '#active-navigation',
@@ -26,9 +26,9 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
accept: $('#available li .drag-item')
});
- $('#enabled').on('click', '.iconPicker', function() {
+ $('#enabled').on('click', '.iconPicker', function () {
var iconEl = $(this).find('i');
- iconSelect.init(iconEl, function(el) {
+ iconSelect.init(iconEl, function (el) {
var newIconClass = el.attr('value');
var index = iconEl.parents('[data-index]').attr('data-index');
$('#active-navigation [data-index="' + index + '"] i').attr('class', 'fa fa-fw ' + newIconClass);
@@ -68,13 +68,13 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
data.enabled = false;
data.index = (parseInt($('#enabled').children().last().attr('data-index'), 10) || 0) + 1;
- templates.parse('admin/general/navigation', 'navigation', {navigation: [data]}, function(li) {
+ templates.parse('admin/general/navigation', 'navigation', {navigation: [data]}, function (li) {
li = $(translator.unescape(li));
el.after(li);
el.remove();
});
- templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function(li) {
+ templates.parse('admin/general/navigation', 'enabled', {enabled: [data]}, function (li) {
li = $(translator.unescape(li));
$('#enabled').append(li);
componentHandler.upgradeDom()
@@ -85,17 +85,17 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
var nav = [];
var indices = [];
- $('#active-navigation li').each(function() {
+ $('#active-navigation li').each(function () {
indices.push($(this).attr('data-index'));
});
- indices.forEach(function(index) {
+ indices.forEach(function (index) {
var el = $('#enabled').children('[data-index="' + index + '"]');
var form = el.find('form').serializeArray(),
data = {},
properties = {};
- form.forEach(function(input) {
+ form.forEach(function (input) {
if (input.name.slice(0, 9) === 'property:' && input.value === 'on') {
properties[input.name.slice(9)] = true;
} else {
@@ -114,7 +114,7 @@ define('admin/general/navigation', ['translator', 'iconSelect', 'jqueryui'], fun
nav.push(data);
});
- socket.emit('admin.navigation.save', nav, function(err) {
+ socket.emit('admin.navigation.save', nav, function (err) {
if (err) {
app.alertError(err.message);
} else {
diff --git a/public/src/admin/general/social.js b/public/src/admin/general/social.js
index 6816eb3909..9accf87417 100644
--- a/public/src/admin/general/social.js
+++ b/public/src/admin/general/social.js
@@ -1,19 +1,19 @@
"use strict";
/*global define, socket*/
-define('admin/general/social', [], function() {
+define('admin/general/social', [], function () {
var social = {};
- social.init = function() {
- $('#save').on('click', function() {
+ social.init = function () {
+ $('#save').on('click', function () {
var networks = [];
- $('#postSharingNetworks input[type="checkbox"]').each(function() {
+ $('#postSharingNetworks input[type="checkbox"]').each(function () {
if ($(this).prop('checked')) {
networks.push($(this).attr('id'));
}
});
- socket.emit('admin.social.savePostSharingNetworks', networks, function(err) {
+ socket.emit('admin.social.savePostSharingNetworks', networks, function (err) {
if (err) {
return app.alertError(err);
}
diff --git a/public/src/admin/general/sounds.js b/public/src/admin/general/sounds.js
index 73899144a0..0ea87f0917 100644
--- a/public/src/admin/general/sounds.js
+++ b/public/src/admin/general/sounds.js
@@ -1,12 +1,12 @@
"use strict";
/* global app, define, socket */
-define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings) {
+define('admin/general/sounds', ['sounds', 'settings'], function (Sounds, Settings) {
var SoundsAdmin = {};
- SoundsAdmin.init = function() {
+ SoundsAdmin.init = function () {
// Sounds tab
- $('.sounds').find('button[data-action="play"]').on('click', function(e) {
+ $('.sounds').find('button[data-action="play"]').on('click', function (e) {
e.preventDefault();
var fileName = $(this).parent().parent().find('select').val();
@@ -18,8 +18,8 @@ define('admin/general/sounds', ['sounds', 'settings'], function(Sounds, Settings
// Saving of Form Values
var saveEl = $('#save');
- saveEl.on('click', function() {
- Settings.save('sounds', $('.sounds form'), function() {
+ saveEl.on('click', function () {
+ Settings.save('sounds', $('.sounds form'), function () {
socket.emit('admin.fireEvent', {
name: 'event:sounds.reloadMapping'
});
diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js
index 398d24dd42..4244fa41ab 100644
--- a/public/src/admin/manage/categories.js
+++ b/public/src/admin/manage/categories.js
@@ -1,11 +1,11 @@
"use strict";
/*global define, socket, app, bootbox, templates, ajaxify, Sortable */
-define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator'], function(serialize, translator) {
+define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-serializeobject.min', 'translator'], function (serialize, translator) {
var Categories = {}, newCategoryId = -1, sortables;
- Categories.init = function() {
- socket.emit('admin.categories.getAll', function(error, payload){
+ Categories.init = function () {
+ socket.emit('admin.categories.getAll', function (error, payload){
if(error){
return app.alertError(error.message);
}
@@ -16,13 +16,13 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
$('button[data-action="create"]').on('click', Categories.throwCreateModal);
// Enable/Disable toggle events
- $('.categories').on('click', 'button[data-action="toggle"]', function() {
+ $('.categories').on('click', 'button[data-action="toggle"]', function () {
var $this = $(this),
cid = $this.attr('data-cid'),
parentEl = $this.parents('li[data-cid="' + cid + '"]'),
disabled = parentEl.hasClass('disabled');
- var children = parentEl.find('li[data-cid]').map(function() {
+ var children = parentEl.find('li[data-cid]').map(function () {
return $(this).attr('data-cid');
}).get();
@@ -31,15 +31,15 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
});
};
- Categories.throwCreateModal = function() {
- socket.emit('admin.categories.getNames', {}, function(err, categories) {
+ Categories.throwCreateModal = function () {
+ socket.emit('admin.categories.getNames', {}, function (err, categories) {
if (err) {
return app.alertError(err.message);
}
templates.parse('admin/partials/categories/create', {
categories: categories
- }, function(html) {
+ }, function (html) {
function submit() {
var formData = modal.find('form').serializeObject();
formData.description = '';
@@ -67,8 +67,8 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
});
};
- Categories.create = function(payload) {
- socket.emit('admin.categories.create', payload, function(err, data) {
+ Categories.create = function (payload) {
+ socket.emit('admin.categories.create', payload, function (err, data) {
if (err) {
return app.alertError(err.message);
}
@@ -85,7 +85,7 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
});
};
- Categories.render = function(categories){
+ Categories.render = function (categories){
var container = $('.categories');
if (!categories || !categories.length) {
@@ -99,16 +99,16 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
}
};
- Categories.toggle = function(cids, disabled) {
+ Categories.toggle = function (cids, disabled) {
var payload = {};
- cids.forEach(function(cid) {
+ cids.forEach(function (cid) {
payload[cid] = {
disabled: disabled ? 1 : 0
};
});
- socket.emit('admin.categories.update', payload, function(err) {
+ socket.emit('admin.categories.update', payload, function (err) {
if (err) {
return app.alertError(err.message);
}
@@ -154,8 +154,8 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
function renderList(categories, container, parentId){
// Translate category names if needed
var count = 0;
- categories.forEach(function(category, idx, parent) {
- translator.translate(category.name, function(translated) {
+ categories.forEach(function (category, idx, parent) {
+ translator.translate(category.name, function (translated) {
if (category.name !== translated) {
category.name = translated;
}
@@ -175,11 +175,11 @@ define('admin/manage/categories', ['vendor/jquery/serializeObject/jquery.ba-seri
templates.parse('admin/partials/categories/category-rows', {
cid: parentId,
categories: categories
- }, function(html) {
+ }, function (html) {
container.append(html);
// Handle and children categories in this level have
- for(var x=0,numCategories=categories.length;x'+ data.socketCount +'
' +
+ '' + data.socketCount + '
' +
'Connections
' +
'Warning! All topics and posts in this category will be purged!
Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you\'ll want to "disable" the category instead.
', function(confirm) { + bootbox.confirm('Do you really want to purge this category "' + $('form.category').find('input[data-name="name"]').val() + '"?
Warning! All topics and posts in this category will be purged!
Purging a category will remove all topics and posts, and delete the category from the database. If you want to remove a category temporarily, you\'ll want to "disable" the category instead.
', function (confirm) { if (!confirm) { return; } - socket.emit('admin.categories.purge', ajaxify.data.category.cid, function(err) { + socket.emit('admin.categories.purge', ajaxify.data.category.cid, function (err) { if (err) { return app.alertError(err.message); } @@ -103,9 +103,9 @@ define('admin/manage/category', [ }); }); - $('.copy-settings').on('click', function() { - selectCategoryModal(function(cid) { - socket.emit('admin.categories.copySettingsFrom', {fromCid: cid, toCid: ajaxify.data.category.cid}, function(err) { + $('.copy-settings').on('click', function () { + selectCategoryModal(function (cid) { + socket.emit('admin.categories.copySettingsFrom', {fromCid: cid, toCid: ajaxify.data.category.cid}, function (err) { if (err) { return app.alertError(err.message); } @@ -116,7 +116,7 @@ define('admin/manage/category', [ return false; }); - $('.upload-button').on('click', function() { + $('.upload-button').on('click', function () { var inputEl = $(this); var cid = inputEl.attr('data-cid'); @@ -124,7 +124,7 @@ define('admin/manage/category', [ title: 'Upload category image', route: config.relative_path + '/api/admin/category/uploadpicture', params: {cid: cid} - }, function(imageUrlOnServer) { + }, function (imageUrlOnServer) { $('#category-image').val(imageUrlOnServer); var previewBox = inputEl.parent().parent().siblings('.category-preview'); previewBox.css('background', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')'); @@ -133,11 +133,11 @@ define('admin/manage/category', [ }); }); - $('#category-image').on('change', function() { + $('#category-image').on('change', function () { $('.category-preview').css('background-image', $(this).val() ? ('url("' + $(this).val() + '")') : ''); }); - $('.delete-image').on('click', function(e) { + $('.delete-image').on('click', function (e) { e.preventDefault(); var inputEl = $('#category-image'); @@ -149,18 +149,18 @@ define('admin/manage/category', [ $(this).parent().addClass('hide').hide(); }); - $('.category-preview').on('click', function() { + $('.category-preview').on('click', function () { iconSelect.init($(this).find('i'), modified); }); $('button[data-action="setParent"], button[data-action="changeParent"]').on('click', Category.launchParentSelector); - $('button[data-action="removeParent"]').on('click', function() { - var payload= {}; + $('button[data-action="removeParent"]').on('click', function () { + var payload = {}; payload[ajaxify.data.category.cid] = { parentCid: 0 }; - socket.emit('admin.categories.update', payload, function(err) { + socket.emit('admin.categories.update', payload, function (err) { if (err) { return app.alertError(err.message); } @@ -173,8 +173,8 @@ define('admin/manage/category', [ Category.setupPrivilegeTable(); }; - Category.setupPrivilegeTable = function() { - $('.privilege-table-container').on('change', 'input[type="checkbox"]', function() { + Category.setupPrivilegeTable = function () { + $('.privilege-table-container').on('change', 'input[type="checkbox"]', function () { var checkboxEl = $(this), privilege = checkboxEl.parent().attr('data-privilege'), state = checkboxEl.prop('checked'), @@ -185,7 +185,7 @@ define('admin/manage/category', [ if (member) { if (isGroup && privilege === 'groups:moderate' && !isPrivate && state) { - bootbox.confirm('Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.', function(confirm) { + bootbox.confirm('Are you sure you wish to grant the moderation privilege to this user group? This group is public, and any users can join at will.', function (confirm) { if (confirm) { Category.setPrivilege(member, privilege, state, checkboxEl); } else { @@ -208,36 +208,36 @@ define('admin/manage/category', [ Category.exposeAssumedPrivileges(); }; - Category.refreshPrivilegeTable = function() { - socket.emit('admin.categories.getPrivilegeSettings', ajaxify.data.category.cid, function(err, privileges) { + Category.refreshPrivilegeTable = function () { + socket.emit('admin.categories.getPrivilegeSettings', ajaxify.data.category.cid, function (err, privileges) { if (err) { return app.alertError(err.message); } templates.parse('admin/partials/categories/privileges', { privileges: privileges - }, function(html) { + }, function (html) { $('.privilege-table-container').html(html); Category.exposeAssumedPrivileges(); }); }); }; - Category.exposeAssumedPrivileges = function() { + Category.exposeAssumedPrivileges = function () { /* If registered-users has a privilege enabled, then all users and groups of that privilege should be assumed to have that privilege as well, even if not set in the db, so reflect this arrangement in the table */ var privs = []; - $('.privilege-table tr[data-group-name="registered-users"] td input[type="checkbox"]').parent().each(function(idx, el) { + $('.privilege-table tr[data-group-name="registered-users"] td input[type="checkbox"]').parent().each(function (idx, el) { if ($(el).find('input').prop('checked')) { privs.push(el.getAttribute('data-privilege')); } }); - for(var x=0,numPrivs=privs.length;xDo you really want to delete user(s)?
This action is not reversable, only the user account will be deleted, their posts and topics will not be deleled!', function(confirm) { + bootbox.confirm('Warning!
Do you really want to delete user(s)?
This action is not reversable, only the user account will be deleted, their posts and topics will not be deleled!', function (confirm) { if (confirm) { - socket.emit('admin.user.deleteUsers', uids, function(err) { + socket.emit('admin.user.deleteUsers', uids, function (err) { if (err) { return app.alertError(err.message); } @@ -236,14 +236,14 @@ define('admin/manage/users', ['translator'], function(translator) { }); }); - $('.delete-user-and-content').on('click', function() { + $('.delete-user-and-content').on('click', function () { var uids = getSelectedUids(); if (!uids.length) { return; } - bootbox.confirm('Warning!
Do you really want to delete user(s) and their content?
This action is not reversable, all user data and content will be erased!', function(confirm) { + bootbox.confirm('Warning!
Do you really want to delete user(s) and their content?
This action is not reversable, all user data and content will be erased!', function (confirm) { if (confirm) { - socket.emit('admin.user.deleteUsersAndContent', uids, function(err) { + socket.emit('admin.user.deleteUsersAndContent', uids, function (err) { if (err) { return app.alertError(err.message); } @@ -257,9 +257,9 @@ define('admin/manage/users', ['translator'], function(translator) { }); function handleUserCreate() { - $('#createUser').on('click', function() { - templates.parse('admin/partials/create_user_modal', {}, function(html) { - translator.translate(html, function(html) { + $('#createUser').on('click', function () { + templates.parse('admin/partials/create_user_modal', {}, function (html) { + translator.translate(html, function (html) { bootbox.dialog({ message: html, title: 'Create User', @@ -272,7 +272,7 @@ define('admin/manage/users', ['translator'], function(translator) { create: { label: 'Create', className: 'btn-primary', - callback: function() { + callback: function () { createUser.call(this); return false; } @@ -303,13 +303,13 @@ define('admin/manage/users', ['translator'], function(translator) { password: password }; - socket.emit('admin.user.createUser', user, function(err) { + socket.emit('admin.user.createUser', user, function (err) { if(err) { return errorEl.translateHtml('Error
' + err.message + '
').removeClass('hide'); } modal.modal('hide'); - modal.on('hidden.bs.modal', function() { + modal.on('hidden.bs.modal', function () { ajaxify.refresh(); }); app.alertSuccess('User created!'); @@ -318,7 +318,7 @@ define('admin/manage/users', ['translator'], function(translator) { var timeoutId = 0; - $('#search-user-name, #search-user-email, #search-user-ip').on('keyup', function() { + $('#search-user-name, #search-user-email, #search-user-ip').on('keyup', function () { if (timeoutId !== 0) { clearTimeout(timeoutId); timeoutId = 0; @@ -327,15 +327,15 @@ define('admin/manage/users', ['translator'], function(translator) { var $this = $(this); var type = $this.attr('data-search-type'); - timeoutId = setTimeout(function() { + timeoutId = setTimeout(function () { $('.fa-spinner').removeClass('hidden'); - socket.emit('admin.user.search', {searchBy: type, query: $this.val()}, function(err, data) { + socket.emit('admin.user.search', {searchBy: type, query: $this.val()}, function (err, data) { if (err) { return app.alertError(err.message); } - templates.parse('admin/manage/users', 'users', data, function(html) { + templates.parse('admin/manage/users', 'users', data, function (html) { html = $(html); $('.users-table tr').not(':first').remove(); $('.users-table tr').first().after(html); @@ -367,13 +367,13 @@ define('admin/manage/users', ['translator'], function(translator) { }; function handleInvite() { - $('[component="user/invite"]').on('click', function() { - bootbox.prompt('Email: ', function(email) { + $('[component="user/invite"]').on('click', function () { + bootbox.prompt('Email: ', function (email) { if (!email) { return; } - socket.emit('user.invite', email, function(err) { + socket.emit('user.invite', email, function (err) { if (err) { return app.alertError(err.message); } diff --git a/public/src/admin/modules/colorpicker.js b/public/src/admin/modules/colorpicker.js index 6a0054ae85..47e129249a 100644 --- a/public/src/admin/modules/colorpicker.js +++ b/public/src/admin/modules/colorpicker.js @@ -2,22 +2,22 @@ /*globals define*/ -define('admin/modules/colorpicker', function() { +define('admin/modules/colorpicker', function () { var colorpicker = {}; - colorpicker.enable = function(inputEl, callback) { - (inputEl instanceof jQuery ? inputEl : $(inputEl)).each(function() { + colorpicker.enable = function (inputEl, callback) { + (inputEl instanceof jQuery ? inputEl : $(inputEl)).each(function () { var $this = $(this); $this.ColorPicker({ color: $this.val() || '#000', - onChange: function(hsb, hex) { + onChange: function (hsb, hex) { $this.val('#' + hex); if (typeof callback === 'function') { callback(hsb, hex); } }, - onShow: function(colpkr) { + onShow: function (colpkr) { $(colpkr).css('z-index', 1051); } }); diff --git a/public/src/admin/modules/instance.js b/public/src/admin/modules/instance.js index edad60b80e..d5c2164155 100644 --- a/public/src/admin/modules/instance.js +++ b/public/src/admin/modules/instance.js @@ -2,10 +2,10 @@ /*globals define, app, socket*/ -define('admin/modules/instance', function() { +define('admin/modules/instance', function () { var instance = {}; - instance.reload = function(callback) { + instance.reload = function (callback) { app.alert({ alert_id: 'instance_reload', type: 'info', @@ -14,7 +14,7 @@ define('admin/modules/instance', function() { timeout: 5000 }); - socket.emit('admin.reload', function(err) { + socket.emit('admin.reload', function (err) { if (!err) { app.alert({ alert_id: 'instance_reload', @@ -38,7 +38,7 @@ define('admin/modules/instance', function() { }); }; - instance.restart = function(callback) { + instance.restart = function (callback) { app.alert({ alert_id: 'instance_restart', type: 'info', @@ -47,7 +47,7 @@ define('admin/modules/instance', function() { timeout: 5000 }); - $(window).one('action:reconnected', function() { + $(window).one('action:reconnected', function () { app.alert({ alert_id: 'instance_restart', type: 'success', diff --git a/public/src/admin/modules/search.js b/public/src/admin/modules/search.js index ae15ad0064..b639034ebd 100644 --- a/public/src/admin/modules/search.js +++ b/public/src/admin/modules/search.js @@ -1,11 +1,11 @@ "use strict"; /*globals define, admin, ajaxify, RELATIVE_PATH*/ -define(function() { +define(function () { var search = {}, searchIndex; - search.init = function() { + search.init = function () { $.getJSON(RELATIVE_PATH + '/templates/indexed.json', function (data) { searchIndex = data; for (var file in searchIndex) { @@ -31,17 +31,17 @@ define(function() { input = $('#acp-search input'), firstResult = null; - input.on('keyup', function() { + input.on('keyup', function () { $('#acp-search .dropdown').addClass('open'); }); - $('#acp-search').parents('form').on('submit', function(ev) { + $('#acp-search').parents('form').on('submit', function (ev) { var input = $(this).find('input'), href = firstResult ? firstResult : RELATIVE_PATH + '/search/' + input.val(); ajaxify.go(href.replace(/^\//, '')); - setTimeout(function() { + setTimeout(function () { $('#acp-search .dropdown').removeClass('open'); $(input).blur(); }, 150); @@ -50,11 +50,11 @@ define(function() { return false; }); - $('#main-menu a').each(function(idx, link) { + $('#main-menu a').each(function (idx, link) { routes.push($(link).attr('href')); }); - input.on('keyup focus', function() { + input.on('keyup focus', function () { var $input = $(this), value = $input.val().toLowerCase(), menuItems = $('#acp-search .dropdown-menu').html(''); diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js index 5e4bb5725f..6964f74924 100644 --- a/public/src/admin/modules/selectable.js +++ b/public/src/admin/modules/selectable.js @@ -2,10 +2,10 @@ /*globals define*/ -define('admin/modules/selectable', ['jqueryui'], function(jqueryui) { +define('admin/modules/selectable', ['jqueryui'], function (jqueryui) { var selectable = {}; - selectable.enable = function(containerEl, targets) { + selectable.enable = function (containerEl, targets) { $(containerEl).selectable({ filter: targets }); diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index d6436ccefc..ce0a17933f 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -1,16 +1,16 @@ 'use strict'; /*global define, app, socket, ajaxify */ -define('admin/settings', ['uploader'], function(uploader) { +define('admin/settings', ['uploader'], function (uploader) { var Settings = {}; - Settings.init = function() { + Settings.init = function () { console.warn('[deprecation] require(\'admin/settings\').init() has been deprecated, please call require(\'admin/settings\').prepare() directly instead.'); Settings.prepare(); }; - Settings.populateTOC = function() { - $('.settings-header').each(function() { + Settings.populateTOC = function () { + $('.settings-header').each(function () { var header = $(this).text(), anchor = header.toLowerCase().replace(/ /g, '-').trim(); @@ -19,7 +19,7 @@ define('admin/settings', ['uploader'], function(uploader) { }); }; - Settings.prepare = function(callback) { + Settings.prepare = function (callback) { // Populate the fields on the page from the config var fields = $('#content [data-field]'), numFields = fields.length, @@ -28,7 +28,7 @@ define('admin/settings', ['uploader'], function(uploader) { x, key, inputType, field; // Handle unsaved changes - $(fields).on('change', function() { + $(fields).on('change', function () { app.flags = app.flags || {}; app.flags._unsaved = true; }); @@ -66,11 +66,11 @@ define('admin/settings', ['uploader'], function(uploader) { } } - revertBtn.off('click').on('click', function() { + revertBtn.off('click').on('click', function () { ajaxify.refresh(); }); - saveBtn.off('click').on('click', function(e) { + saveBtn.off('click').on('click', function (e) { e.preventDefault(); saveFields(fields, function onFieldsSaved(err) { @@ -100,8 +100,8 @@ define('admin/settings', ['uploader'], function(uploader) { handleUploads(); - $('#clear-sitemap-cache').off('click').on('click', function() { - socket.emit('admin.settings.clearSitemapCache', function() { + $('#clear-sitemap-cache').off('click').on('click', function () { + socket.emit('admin.settings.clearSitemapCache', function () { app.alertSuccess('Sitemap Cache Cleared!'); }); return false; @@ -111,15 +111,15 @@ define('admin/settings', ['uploader'], function(uploader) { callback(); } - setTimeout(function() { + setTimeout(function () { $(window).trigger('action:admin.settingsLoaded'); }, 0); }; function handleUploads() { - $('#content input[data-action="upload"]').each(function() { + $('#content input[data-action="upload"]').each(function () { var uploadBtn = $(this); - uploadBtn.on('click', function() { + uploadBtn.on('click', function () { uploader.show({ title: uploadBtn.attr('data-title'), description: uploadBtn.attr('data-description'), @@ -127,7 +127,7 @@ define('admin/settings', ['uploader'], function(uploader) { params: {}, showHelp: uploadBtn.attr('data-help') ? uploadBtn.attr('data-help') === 1 : undefined, accept: uploadBtn.attr('data-accept') - }, function(image) { + }, function (image) { // need to move these into template, ex data-callback if (ajaxify.currentPage === 'admin/general/sounds') { ajaxify.refresh(); @@ -139,14 +139,14 @@ define('admin/settings', ['uploader'], function(uploader) { }); } - Settings.remove = function(key) { + Settings.remove = function (key) { socket.emit('admin.config.remove', key); }; function saveFields(fields, callback) { var data = {}; - fields.each(function() { + fields.each(function () { var field = $(this); var key = field.attr('data-field'), value, inputType; @@ -173,7 +173,7 @@ define('admin/settings', ['uploader'], function(uploader) { data[key] = value; }); - socket.emit('admin.config.setMultiple', data, function(err) { + socket.emit('admin.config.setMultiple', data, function (err) { if (err) { return callback(err); } diff --git a/public/src/admin/settings/email.js b/public/src/admin/settings/email.js index e404099800..d296c8aa25 100644 --- a/public/src/admin/settings/email.js +++ b/public/src/admin/settings/email.js @@ -1,23 +1,23 @@ "use strict"; /* global define, socket, app, ajaxify, ace */ -define('admin/settings/email', ['admin/settings'], function(settings) { +define('admin/settings/email', ['admin/settings'], function (settings) { var module = {}, emailEditor; - module.init = function() { + module.init = function () { configureEmailTester(); configureEmailEditor(); $(window).on('action:admin.settingsLoaded action:admin.settingsSaved', handleDigestHourChange); - $(window).on('action:admin.settingsSaved', function() { + $(window).on('action:admin.settingsSaved', function () { socket.emit('admin.user.restartJobs'); }); }; function configureEmailTester() { - $('button[data-action="email.test"]').off('click').on('click', function() { - socket.emit('admin.email.test', {template: $('#test-email').val()}, function(err) { + $('button[data-action="email.test"]').off('click').on('click', function () { + socket.emit('admin.email.test', {template: $('#test-email').val()}, function (err) { if (err) { return app.alertError(err.message); } @@ -34,10 +34,10 @@ define('admin/settings/email', ['admin/settings'], function(settings) { emailEditor.setTheme("ace/theme/twilight"); emailEditor.getSession().setMode("ace/mode/html"); - emailEditor.on('change', function() { + emailEditor.on('change', function () { var emailPath = $('#email-editor-selector').val(); var original; - ajaxify.data.emails.forEach(function(email) { + ajaxify.data.emails.forEach(function (email) { if (email.path === emailPath) { original = email.original; } @@ -46,8 +46,8 @@ define('admin/settings/email', ['admin/settings'], function(settings) { $('#email-editor-holder').val(newEmail !== original ? newEmail : ''); }); - $('button[data-action="email.revert"]').off('click').on('click', function() { - ajaxify.data.emails.forEach(function(email) { + $('button[data-action="email.revert"]').off('click').on('click', function () { + ajaxify.data.emails.forEach(function (email) { if (email.path === $('#email-editor-selector').val()) { emailEditor.getSession().setValue(email.original); $('#email-editor-holder').val(''); @@ -59,7 +59,7 @@ define('admin/settings/email', ['admin/settings'], function(settings) { } function updateEmailEditor() { - ajaxify.data.emails.forEach(function(email) { + ajaxify.data.emails.forEach(function (email) { if (email.path === $('#email-editor-selector').val()) { emailEditor.getSession().setValue(email.text); $('#email-editor-holder') @@ -78,7 +78,7 @@ define('admin/settings/email', ['admin/settings'], function(settings) { hour = 0; } - socket.emit('meta.getServerTime', {}, function(err, now) { + socket.emit('meta.getServerTime', {}, function (err, now) { if (err) { return app.alertError(err.message); } diff --git a/public/src/admin/settings/general.js b/public/src/admin/settings/general.js index 0c36db401c..fc0d7d540f 100644 --- a/public/src/admin/settings/general.js +++ b/public/src/admin/settings/general.js @@ -1,20 +1,20 @@ "use strict"; /* global define, socket */ -define('admin/settings/general', ['admin/settings'], function(Settings) { +define('admin/settings/general', ['admin/settings'], function (Settings) { var Module = {} - Module.init = function() { - $('button[data-action="removeLogo"]').on('click', function() { + Module.init = function () { + $('button[data-action="removeLogo"]').on('click', function () { $('input[data-field="brand:logo"]').val(''); }); - $('button[data-action="removeFavicon"]').on('click', function() { + $('button[data-action="removeFavicon"]').on('click', function () { $('input[data-field="brand:favicon"]').val(''); }); - $('button[data-action="removeTouchIcon"]').on('click', function() { + $('button[data-action="removeTouchIcon"]').on('click', function () { $('input[data-field="brand:touchIcon"]').val(''); }); - $('button[data-action="removeOgImage"]').on('click', function() { + $('button[data-action="removeOgImage"]').on('click', function () { $('input[data-field="removeOgImage"]').val(''); }); }; diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index b4ad44e51b..955acab7bb 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -3,7 +3,7 @@ var ajaxify = ajaxify || {}; -$(document).ready(function() { +$(document).ready(function () { var location = document.location || window.location; var rootUrl = location.protocol + '//' + (location.hostname || location.host) + (location.port ? ':' + location.port : ''); var apiXHR = null; @@ -14,7 +14,7 @@ $(document).ready(function() { // Dumb hack to fool ajaxify into thinking translator is still a global // When ajaxify is migrated to a require.js module, then this can be merged into the "define" call - require(['translator'], function(_translator) { + require(['translator'], function (_translator) { translator = _translator; }); @@ -27,7 +27,7 @@ $(document).ready(function() { url: ev.state.returnPath }, ev.state.returnPath, config.relative_path + '/' + ev.state.returnPath); } else if (ev.state.url !== undefined) { - ajaxify.go(ev.state.url, function() { + ajaxify.go(ev.state.url, function () { $(window).trigger('action:popstate', {url: ev.state.url}); }, true); } @@ -41,7 +41,7 @@ $(document).ready(function() { if (ajaxify.reconnectAction) { $(window).off('action:reconnected', ajaxify.reconnectAction); } - ajaxify.reconnectAction = function(e) { + ajaxify.reconnectAction = function (e) { ajaxify.go(url, callback, quiet); $(window).off(e); }; @@ -75,7 +75,7 @@ $(document).ready(function() { previousBodyClass = ajaxify.data.bodyClass; $('#footer, #content').removeClass('hide').addClass('ajaxifying'); - ajaxify.loadData(url, function(err, data) { + ajaxify.loadData(url, function (err, data) { if (!err || (err && err.data && (parseInt(err.data.status, 10) !== 302 && parseInt(err.data.status, 10) !== 308))) { ajaxify.updateHistory(url, quiet); @@ -88,7 +88,7 @@ $(document).ready(function() { retry = true; app.template = data.template.name; - require(['translator'], function(translator) { + require(['translator'], function (translator) { translator.load(config.defaultLang, data.template.name); renderTemplate(url, data.template.name, data, callback); }); @@ -97,7 +97,7 @@ $(document).ready(function() { return true; }; - ajaxify.handleRedirects = function(url) { + ajaxify.handleRedirects = function (url) { url = ajaxify.removeRelativePath(url.replace(/\/$/, '')).toLowerCase(); var isClientToAdmin = url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0; var isAdminToClient = !url.startsWith('admin') && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') === 0; @@ -110,7 +110,7 @@ $(document).ready(function() { }; - ajaxify.start = function(url) { + ajaxify.start = function (url) { url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, '')); var payload = { @@ -122,7 +122,7 @@ $(document).ready(function() { return payload.url; }; - ajaxify.updateHistory = function(url, quiet) { + ajaxify.updateHistory = function (url, quiet) { ajaxify.currentPage = url.split(/[?#]/)[0]; if (window.history && window.history.pushState) { window.history[!quiet ? 'pushState' : 'replaceState']({ @@ -171,8 +171,8 @@ $(document).ready(function() { function renderTemplate(url, tpl_url, data, callback) { $(window).trigger('action:ajaxify.loadingTemplates', {}); - templates.parse(tpl_url, data, function(template) { - translator.translate(template, function(translatedTemplate) { + templates.parse(tpl_url, data, function (template) { + translator.translate(template, function (translatedTemplate) { translatedTemplate = translator.unescape(translatedTemplate); $('body').removeClass(previousBodyClass).addClass(data.bodyClass); $('#content').html(translatedTemplate); @@ -190,7 +190,7 @@ $(document).ready(function() { }); } - ajaxify.end = function(url, tpl_url) { + ajaxify.end = function (url, tpl_url) { function done() { if (--count === 0) { $(window).trigger('action:ajaxify.end', {url: url, tpl_url: tpl_url, title: ajaxify.data.title}); @@ -207,7 +207,7 @@ $(document).ready(function() { app.processPage(); }; - ajaxify.parseData = function() { + ajaxify.parseData = function () { var dataEl = $('#ajaxify-data'); if (dataEl.length) { ajaxify.data = JSON.parse(dataEl.text()); @@ -215,18 +215,18 @@ $(document).ready(function() { } }; - ajaxify.removeRelativePath = function(url) { + ajaxify.removeRelativePath = function (url) { if (url.startsWith(RELATIVE_PATH.slice(1))) { url = url.slice(RELATIVE_PATH.length); } return url; }; - ajaxify.refresh = function(callback) { + ajaxify.refresh = function (callback) { ajaxify.go(ajaxify.currentPage + window.location.search + window.location.hash, callback, true); }; - ajaxify.loadScript = function(tpl_url, callback) { + ajaxify.loadScript = function (tpl_url, callback) { var location = !app.inAdmin ? 'forum/' : ''; if (tpl_url.startsWith('admin')) { @@ -239,7 +239,7 @@ $(document).ready(function() { $(window).trigger('action:script.load', data); - require(data.scripts, function(script) { + require(data.scripts, function (script) { if (script && script.init) { script.init(); } @@ -250,7 +250,7 @@ $(document).ready(function() { }); }; - ajaxify.loadData = function(url, callback) { + ajaxify.loadData = function (url, callback) { url = ajaxify.removeRelativePath(url); $(window).trigger('action:ajaxify.loadingData', {url: url}); @@ -258,7 +258,7 @@ $(document).ready(function() { apiXHR = $.ajax({ url: RELATIVE_PATH + '/api/' + url, cache: false, - success: function(data) { + success: function (data) { if (!data) { return; } @@ -270,7 +270,7 @@ $(document).ready(function() { callback(null, data); }, - error: function(data, textStatus) { + error: function (data, textStatus) { if (data.status === 0 && textStatus === 'error') { data.status = 500; } @@ -282,17 +282,17 @@ $(document).ready(function() { }); }; - ajaxify.loadTemplate = function(template, callback) { + ajaxify.loadTemplate = function (template, callback) { if (templates.cache[template]) { callback(templates.cache[template]); } else { $.ajax({ url: RELATIVE_PATH + '/templates/' + template + '.tpl' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), type: 'GET', - success: function(data) { + success: function (data) { callback(data.toString()); }, - error: function(error) { + error: function (error) { throw new Error("Unable to load template: " + template + " (" + error.statusText + ")"); } }); @@ -309,7 +309,7 @@ $(document).ready(function() { // Enhancing all anchors to ajaxify... $(document.body).on('click', 'a', function (e) { var _self = this; - var process = function() { + var process = function () { if (!e.ctrlKey && !e.shiftKey && !e.metaKey && e.which === 1) { if (internalLink) { var pathname = this.href.replace(rootUrl + RELATIVE_PATH + '/', ''); @@ -358,8 +358,8 @@ $(document).ready(function() { } if (app.flags && app.flags.hasOwnProperty('_unsaved') && app.flags._unsaved === true) { - translator.translate('[[global:unsaved-changes]]', function(text) { - bootbox.confirm(text, function(navigate) { + translator.translate('[[global:unsaved-changes]]', function (text) { + bootbox.confirm(text, function (navigate) { if (navigate) { app.flags._unsaved = false; process.call(_self); @@ -382,7 +382,7 @@ $(document).ready(function() { app.load(); - $('[type="text/tpl"][data-template]').each(function() { + $('[type="text/tpl"][data-template]').each(function () { templates.cache[$(this).attr('data-template')] = $('').html($(this).html()).text(); $(this).parent().remove(); }); diff --git a/public/src/app.js b/public/src/app.js index 46f0419709..442e57f373 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -19,7 +19,7 @@ app.cacheBuster = null; locale: config.userLang }); - app.load = function() { + app.load = function () { app.loadProgressiveStylesheet(); var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash); @@ -33,15 +33,15 @@ app.cacheBuster = null; app.handleSearch(); } - $('body').on('click', '#new_topic', function(){ + $('body').on('click', '#new_topic', function (){ app.newTopic(); }); - require(['components'], function(components) { + require(['components'], function (components) { components.get('user/logout').on('click', app.logout); }); - Visibility.change(function(event, state){ + Visibility.change(function (event, state){ if (state === 'visible') { app.isFocused = true; app.alternatingTitle(''); @@ -56,7 +56,7 @@ app.cacheBuster = null; app.showEmailConfirmWarning(); socket.removeAllListeners('event:nodebb.ready'); - socket.on('event:nodebb.ready', function(data) { + socket.on('event:nodebb.ready', function (data) { if (!app.cacheBuster || app.cacheBuster !== data['cache-buster']) { app.cacheBuster = data['cache-buster']; @@ -64,7 +64,7 @@ app.cacheBuster = null; alert_id: 'forum_updated', title: '[[global:updated.title]]', message: '[[global:updated.message]]', - clickfn: function() { + clickfn: function () { window.location.reload(); }, type: 'warning' @@ -72,7 +72,7 @@ app.cacheBuster = null; } }); - require(['taskbar', 'helpers', 'forum/pagination'], function(taskbar, helpers, pagination) { + require(['taskbar', 'helpers', 'forum/pagination'], function (taskbar, helpers, pagination) { taskbar.init(); // templates.js helpers @@ -84,14 +84,14 @@ app.cacheBuster = null; }); }; - app.logout = function() { + app.logout = function () { $(window).trigger('action:app.logout'); $.ajax(config.relative_path + '/logout', { type: 'POST', headers: { 'x-csrf-token': config.csrf_token }, - success: function() { + success: function () { var payload = { next: config.relative_path + '/' }; @@ -103,13 +103,13 @@ app.cacheBuster = null; }; app.alert = function (params) { - require(['alerts'], function(alerts) { + require(['alerts'], function (alerts) { alerts.alert(params); }); }; - app.removeAlert = function(id) { - require(['alerts'], function(alerts) { + app.removeAlert = function (id) { + require(['alerts'], function (alerts) { alerts.remove(id); }); }; @@ -136,7 +136,7 @@ app.cacheBuster = null; }); }; - app.handleInvalidSession = function() { + app.handleInvalidSession = function () { if (app.flags && app.flags._sessionRefresh) { return; } @@ -144,13 +144,13 @@ app.cacheBuster = null; app.flags = app.flags || {}; app.flags._sessionRefresh = true; - require(['translator'], function(translator) { - translator.translate('[[error:invalid-session-text]]', function(translated) { + require(['translator'], function (translator) { + translator.translate('[[error:invalid-session-text]]', function (translated) { bootbox.alert({ title: '[[error:invalid-session]]', message: translated, closeButton: false, - callback: function() { + callback: function () { window.location.reload(); } }); @@ -159,13 +159,13 @@ app.cacheBuster = null; }; app.enterRoom = function (room, callback) { - callback = callback || function() {}; + callback = callback || function () {}; if (socket && app.user.uid && app.currentRoom !== room) { var previousRoom = app.currentRoom; app.currentRoom = room; socket.emit('meta.rooms.enter', { enter: room - }, function(err) { + }, function (err) { if (err) { app.currentRoom = previousRoom; return app.alertError(err.message); @@ -176,11 +176,11 @@ app.cacheBuster = null; } }; - app.leaveCurrentRoom = function() { + app.leaveCurrentRoom = function () { if (!socket) { return; } - socket.emit('meta.rooms.leaveCurrent', function(err) { + socket.emit('meta.rooms.leaveCurrent', function (err) { if (err) { return app.alertError(err.message); } @@ -196,9 +196,9 @@ app.cacheBuster = null; } } - app.createUserTooltips = function(els, placement) { + app.createUserTooltips = function (els, placement) { els = els || $('body'); - els.find('.avatar,img[title].teaser-pic,img[title].user-img,div.user-icon,span.user-icon').each(function() { + els.find('.avatar,img[title].teaser-pic,img[title].user-img,div.user-icon,span.user-icon').each(function () { if (!utils.isTouchDevice()) { $(this).tooltip({ placement: placement || $(this).attr('title-placement') || 'top', @@ -208,7 +208,7 @@ app.cacheBuster = null; }); }; - app.createStatusTooltips = function() { + app.createStatusTooltips = function () { if (!utils.isTouchDevice()) { $('body').tooltip({ selector:'.fa-circle.status', @@ -217,9 +217,9 @@ app.cacheBuster = null; } }; - app.replaceSelfLinks = function(selector) { + app.replaceSelfLinks = function (selector) { selector = selector || $('a'); - selector.each(function() { + selector.each(function () { var href = $(this).attr('href'); if (href && app.user.userslug && href.indexOf('user/_self_') !== -1) { $(this).attr('href', href.replace(/user\/_self_/g, 'user/' + app.user.userslug)); @@ -281,11 +281,11 @@ app.cacheBuster = null; if (chat.modalExists(roomId)) { loadAndCenter(chat.getModal(roomId)); } else { - socket.emit('modules.chats.loadRoom', {roomId: roomId, uid: uid || app.user.uid}, function(err, roomData) { + socket.emit('modules.chats.loadRoom', {roomId: roomId, uid: uid || app.user.uid}, function (err, roomData) { if (err) { return app.alertError(err.message); } - roomData.users = roomData.users.filter(function(user) { + roomData.users = roomData.users.filter(function (user) { return user && parseInt(user.uid, 10) !== parseInt(app.user.uid, 10); }); roomData.uid = uid || app.user.uid; @@ -296,12 +296,12 @@ app.cacheBuster = null; }; app.newChat = function (touid, callback) { - callback = callback || function() {}; + callback = callback || function () {}; if (!app.user.uid) { return app.alertError('[[error:not-logged-in]]'); } - socket.emit('modules.chats.newRoom', {touid: touid}, function(err, roomId) { + socket.emit('modules.chats.newRoom', {touid: touid}, function (err, roomId) { if (err) { return app.alertError(err.message); } @@ -332,14 +332,14 @@ app.cacheBuster = null; titleObj.titles[0] = window.document.title; } - require(['translator'], function(translator) { - translator.translate(title, function(translated) { + require(['translator'], function (translator) { + translator.translate(title, function (translated) { titleObj.titles[1] = translated; if (titleObj.interval) { clearInterval(titleObj.interval); } - titleObj.interval = setInterval(function() { + titleObj.interval = setInterval(function () { var title = titleObj.titles[titleObj.titles.indexOf(window.document.title) ^ 1]; if (title) { window.document.title = $('').html(title).text(); @@ -357,23 +357,23 @@ app.cacheBuster = null; } }; - app.refreshTitle = function(title) { + app.refreshTitle = function (title) { if (!title) { return; } - require(['translator'], function(translator) { + require(['translator'], function (translator) { title = config.titleLayout.replace(/{/g, '{').replace(/}/g, '}') - .replace('{pageTitle}', function() { return title; }) - .replace('{browserTitle}', function() { return config.browserTitle; }); + .replace('{pageTitle}', function () { return title; }) + .replace('{browserTitle}', function () { return config.browserTitle; }); - translator.translate(title, function(translated) { + translator.translate(title, function (translated) { titleObj.titles[0] = translated; app.alternatingTitle(''); }); }); }; - app.toggleNavbar = function(state) { + app.toggleNavbar = function (state) { var navbarEl = $('.navbar'); if (navbarEl) { navbarEl.toggleClass('hidden', !!!state); @@ -385,7 +385,7 @@ app.cacheBuster = null; if (env === 'xs' || env === 'sm') { return; } - $('#header-menu li a[title]').each(function() { + $('#header-menu li a[title]').each(function () { if (!utils.isTouchDevice()) { $(this).tooltip({ placement: 'bottom', @@ -417,7 +417,7 @@ app.cacheBuster = null; searchFields = $("#search-fields"), searchInput = $('#search-fields input'); - $('#search-form .advanced-search-link').on('mousedown', function() { + $('#search-form .advanced-search-link').on('mousedown', function () { ajaxify.go('/search'); }); @@ -429,7 +429,7 @@ app.cacheBuster = null; searchButton.removeClass('hidden'); } - searchButton.on('click', function(e) { + searchButton.on('click', function (e) { if (!config.loggedIn && !config.allowGuestSearching) { app.alert({ message:'[[error:search-requires-login]]', @@ -446,10 +446,10 @@ app.cacheBuster = null; $('#search-form').on('submit', function () { var input = $(this).find('input'); - require(['search'], function(search) { + require(['search'], function (search) { var data = search.getSearchPreferences(); data.term = input.val(); - search.query(data, function() { + search.query(data, function () { input.val(''); }); }); @@ -457,16 +457,16 @@ app.cacheBuster = null; }); }; - app.prepareSearch = function() { + app.prepareSearch = function () { $("#search-fields").removeClass('hidden'); $("#search-button").addClass('hidden'); $('#search-fields input').focus(); }; function handleStatusChange() { - $('[component="header/usercontrol"] [data-status]').off('click').on('click', function(e) { + $('[component="header/usercontrol"] [data-status]').off('click').on('click', function (e) { var status = $(this).attr('data-status'); - socket.emit('user.setStatus', status, function(err) { + socket.emit('user.setStatus', status, function (err) { if(err) { return app.alertError(err.message); } @@ -480,13 +480,13 @@ app.cacheBuster = null; }); } - app.updateUserStatus = function(el, status) { + app.updateUserStatus = function (el, status) { if (!el.length) { return; } - require(['translator'], function(translator) { - translator.translate('[[global:' + status + ']]', function(translated) { + require(['translator'], function (translator) { + translator.translate('[[global:' + status + ']]', function (translated) { el.removeClass('online offline dnd away') .addClass(status) .attr('title', translated) @@ -502,7 +502,7 @@ app.cacheBuster = null; }); }; - app.loadJQueryUI = function(callback) { + app.loadJQueryUI = function (callback) { if (typeof $().autocomplete === 'function') { return callback(); } @@ -514,7 +514,7 @@ app.cacheBuster = null; document.head.appendChild(scriptEl); }; - app.showEmailConfirmWarning = function(err) { + app.showEmailConfirmWarning = function (err) { if (!config.requireEmailConfirmation || !app.user.uid) { return; } @@ -526,16 +526,16 @@ app.cacheBuster = null; if (!app.user.email) { msg.message = '[[error:no-email-to-confirm]]'; - msg.clickfn = function() { + msg.clickfn = function () { app.removeAlert('email_confirm'); ajaxify.go('user/' + app.user.userslug + '/edit'); }; app.alert(msg); } else if (!app.user['email:confirmed'] && !app.user.isEmailConfirmSent) { msg.message = err ? err.message : '[[error:email-not-confirmed]]'; - msg.clickfn = function() { + msg.clickfn = function () { app.removeAlert('email_confirm'); - socket.emit('user.emailConfirm', {}, function(err) { + socket.emit('user.emailConfirm', {}, function (err) { if (err) { return app.alertError(err.message); } @@ -550,30 +550,30 @@ app.cacheBuster = null; } }; - app.parseAndTranslate = function(template, blockName, data, callback) { - require(['translator'], function(translator) { + app.parseAndTranslate = function (template, blockName, data, callback) { + require(['translator'], function (translator) { function translate(html, callback) { - translator.translate(html, function(translatedHTML) { + translator.translate(html, function (translatedHTML) { translatedHTML = translator.unescape(translatedHTML); callback($(translatedHTML)); }); } if (typeof blockName === 'string') { - templates.parse(template, blockName, data, function(html) { + templates.parse(template, blockName, data, function (html) { translate(html, callback); }); } else { callback = data; data = blockName; - templates.parse(template, data, function(html) { + templates.parse(template, data, function (html) { translate(html, callback); }); } }); }; - app.loadProgressiveStylesheet = function() { + app.loadProgressiveStylesheet = function () { var linkEl = document.createElement('link'); linkEl.rel = 'stylesheet'; linkEl.href = config.relative_path + '/js-enabled.css'; diff --git a/public/src/client/account/best.js b/public/src/client/account/best.js index 27384f9638..abc88620bf 100644 --- a/public/src/client/account/best.js +++ b/public/src/client/account/best.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/best', ['forum/account/header', 'forum/account/posts'], function(header, posts) { +define('forum/account/best', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Best = {}; - Best.init = function() { + Best.init = function () { header.init(); $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); diff --git a/public/src/client/account/bookmarks.js b/public/src/client/account/bookmarks.js index d1aca2080e..3f9b848b75 100644 --- a/public/src/client/account/bookmarks.js +++ b/public/src/client/account/bookmarks.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/bookmarks', ['forum/account/header', 'forum/account/posts'], function(header, posts) { +define('forum/account/bookmarks', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Bookmarks = {}; - Bookmarks.init = function() { + Bookmarks.init = function () { header.init(); $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); diff --git a/public/src/client/account/downvoted.js b/public/src/client/account/downvoted.js index 1a3758e215..b84e5da6bf 100644 --- a/public/src/client/account/downvoted.js +++ b/public/src/client/account/downvoted.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/downvoted', ['forum/account/header', 'forum/account/posts'], function(header, posts) { +define('forum/account/downvoted', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Downvoted = {}; - Downvoted.init = function() { + Downvoted.init = function () { header.init(); $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js index 51632481cb..915e2b5079 100644 --- a/public/src/client/account/edit.js +++ b/public/src/client/account/edit.js @@ -2,16 +2,16 @@ /* globals define, ajaxify, socket, app, config, templates, bootbox */ -define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', 'components'], function(header, uploader, translator, components) { +define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', 'components'], function (header, uploader, translator, components) { var AccountEdit = {}; - AccountEdit.init = function() { + AccountEdit.init = function () { header.init(); $('#submitBtn').on('click', updateProfile); - app.loadJQueryUI(function() { + app.loadJQueryUI(function () { $('#inputBirthday').datepicker({ changeMonth: true, changeYear: true, @@ -39,7 +39,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', aboutme: $('#inputAboutMe').val() }; - socket.emit('user.updateProfile', userData, function(err, data) { + socket.emit('user.updateProfile', userData, function (err, data) { if (err) { return app.alertError(err.message); } @@ -70,14 +70,14 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', function handleImageChange() { - $('#changePictureBtn').on('click', function() { - socket.emit('user.getProfilePictures', {uid: ajaxify.data.uid}, function(err, pictures) { + $('#changePictureBtn').on('click', function () { + socket.emit('user.getProfilePictures', {uid: ajaxify.data.uid}, function (err, pictures) { if (err) { return app.alertError(err.message); } // boolean to signify whether an uploaded picture is present in the pictures list - var uploaded = pictures.reduce(function(memo, cur) { + var uploaded = pictures.reduce(function (memo, cur) { return memo || cur.type === 'uploaded'; }, false); @@ -85,8 +85,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', pictures: pictures, uploaded: uploaded, allowProfileImageUploads: ajaxify.data.allowProfileImageUploads - }, function(html) { - translator.translate(html, function(html) { + }, function (html) { + translator.translate(html, function (html) { var modal = bootbox.dialog({ className: 'picture-switcher', title: '[[user:change_picture]]', @@ -124,7 +124,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', if (!ajaxify.data.picture) { modal.find('.list-group-item .user-icon').parents('.list-group-item').addClass('active'); } else { - modal.find('.list-group-item img').each(function() { + modal.find('.list-group-item img').each(function () { if (this.getAttribute('src') === ajaxify.data.picture) { $(this).parents('.list-group-item').addClass('active'); } @@ -135,7 +135,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', function saveSelection() { var type = modal.find('.list-group-item.active').attr('data-type'); - changeUserPicture(type, function(err) { + changeUserPicture(type, function (err) { if (err) { return app.alertError(err.message); } @@ -157,9 +157,9 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', } function handleAccountDelete() { - $('#deleteAccountBtn').on('click', function() { - translator.translate('[[user:delete_account_confirm]]', function(translated) { - var modal = bootbox.confirm(translated + '', function(confirm) { + $('#deleteAccountBtn').on('click', function () { + translator.translate('[[user:delete_account_confirm]]', function (translated) { + var modal = bootbox.confirm(translated + '', function (confirm) { if (!confirm) { return; } @@ -168,7 +168,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', app.alertError('[[error:invalid-username]]'); return false; } else { - socket.emit('user.deleteAccount', {}, function(err) { + socket.emit('user.deleteAccount', {}, function (err) { if (err) { return app.alertError(err.message); } @@ -178,7 +178,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', } }); - modal.on('shown.bs.modal', function() { + modal.on('shown.bs.modal', function () { modal.find('input').focus(); }); }); @@ -196,7 +196,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', $('#user-current-picture, img.avatar').attr('src', urlOnServer); ajaxify.data.uploadedpicture = urlOnServer; } else { - ajaxify.refresh(function() { + ajaxify.refresh(function () { $('#user-current-picture, img.avatar').attr('src', urlOnServer); }); } @@ -209,7 +209,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', } } - modal.find('[data-action="upload"]').on('click', function() { + modal.find('[data-action="upload"]').on('click', function () { modal.modal('hide'); uploader.show({ @@ -219,26 +219,26 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', title: '[[user:upload_picture]]', description: '[[user:upload_a_picture]]', accept: '.png,.jpg,.bmp' - }, function(imageUrlOnServer) { + }, function (imageUrlOnServer) { onUploadComplete(imageUrlOnServer); }); return false; }); - modal.find('[data-action="upload-url"]').on('click', function() { + modal.find('[data-action="upload-url"]').on('click', function () { modal.modal('hide'); - templates.parse('partials/modals/upload_picture_from_url_modal', {}, function(html) { - translator.translate(html, function(html) { + templates.parse('partials/modals/upload_picture_from_url_modal', {}, function (html) { + translator.translate(html, function (html) { var uploadModal = $(html); uploadModal.modal('show'); - uploadModal.find('.upload-btn').on('click', function() { + uploadModal.find('.upload-btn').on('click', function () { var url = uploadModal.find('#uploadFromUrl').val(); if (!url) { return; } - socket.emit('user.uploadProfileImageFromUrl', {url: url, uid: ajaxify.data.theirid}, function(err, imageUrlOnServer) { + socket.emit('user.uploadProfileImageFromUrl', {url: url, uid: ajaxify.data.theirid}, function (err, imageUrlOnServer) { if (err) { return app.alertError(err.message); } @@ -255,8 +255,8 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', return false; }); - modal.find('[data-action="remove-uploaded"]').on('click', function() { - socket.emit('user.removeUploadedPicture', {uid: ajaxify.data.theirid}, function(err) { + modal.find('[data-action="remove-uploaded"]').on('click', function () { + socket.emit('user.removeUploadedPicture', {uid: ajaxify.data.theirid}, function (err) { modal.modal('hide'); if (err) { return app.alertError(err.message); @@ -267,9 +267,9 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', } function handleEmailConfirm() { - $('#confirm-email').on('click', function() { + $('#confirm-email').on('click', function () { var btn = $(this).attr('disabled', true); - socket.emit('user.emailConfirm', {}, function(err) { + socket.emit('user.emailConfirm', {}, function (err) { btn.removeAttr('disabled'); if (err) { return app.alertError(err.message); @@ -294,7 +294,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', var el = $('#inputSignature'); $('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength)); - el.on('keyup change', function() { + el.on('keyup change', function () { $('#signatureCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumSignatureLength)); }); } @@ -303,7 +303,7 @@ define('forum/account/edit', ['forum/account/header', 'uploader', 'translator', var el = $('#inputAboutMe'); $('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength)); - el.on('keyup change', function() { + el.on('keyup change', function () { $('#aboutMeCharCountLeft').html(getCharsLeft(el, ajaxify.data.maximumAboutMeLength)); }); } diff --git a/public/src/client/account/edit/email.js b/public/src/client/account/edit/email.js index 1772f76c49..df998bead0 100644 --- a/public/src/client/account/edit/email.js +++ b/public/src/client/account/edit/email.js @@ -2,10 +2,10 @@ /* globals define, ajaxify, socket, app */ -define('forum/account/edit/email', ['forum/account/header'], function(header) { +define('forum/account/edit/email', ['forum/account/header'], function (header) { var AccountEditEmail = {}; - AccountEditEmail.init = function() { + AccountEditEmail.init = function () { header.init(); $('#submitBtn').on('click', function () { @@ -26,7 +26,7 @@ define('forum/account/edit/email', ['forum/account/header'], function(header) { var btn = $(this); btn.addClass('disabled').find('i').removeClass('hide'); - socket.emit('user.changeUsernameEmail', userData, function(err) { + socket.emit('user.changeUsernameEmail', userData, function (err) { btn.removeClass('disabled').find('i').addClass('hide'); if (err) { return app.alertError(err.message); diff --git a/public/src/client/account/edit/password.js b/public/src/client/account/edit/password.js index 3dc36c25b2..a123959804 100644 --- a/public/src/client/account/edit/password.js +++ b/public/src/client/account/edit/password.js @@ -2,10 +2,10 @@ /* globals define, ajaxify, socket, app, utils */ -define('forum/account/edit/password', ['forum/account/header', 'translator'], function(header, translator) { +define('forum/account/edit/password', ['forum/account/header', 'translator'], function (header, translator) { var AccountEditPassword = {}; - AccountEditPassword.init = function() { + AccountEditPassword.init = function () { header.init(); handlePasswordChange(); @@ -56,7 +56,7 @@ define('forum/account/edit/password', ['forum/account/header', 'translator'], fu password.on('blur', onPasswordChanged); password_confirm.on('blur', onPasswordConfirmChanged); - $('#changePasswordBtn').on('click', function() { + $('#changePasswordBtn').on('click', function () { onPasswordChanged(); onPasswordConfirmChanged(); @@ -67,7 +67,7 @@ define('forum/account/edit/password', ['forum/account/header', 'translator'], fu 'currentPassword': currentPassword.val(), 'newPassword': password.val(), 'uid': ajaxify.data.theirid - }, function(err) { + }, function (err) { btn.removeClass('disabled').find('i').addClass('hide'); currentPassword.val(''); password.val(''); @@ -97,22 +97,20 @@ define('forum/account/edit/password', ['forum/account/header', 'translator'], fu } function showError(element, msg) { - translator.translate(msg, function(msg) { - element.find('.error').html(msg).removeClass('hide').siblings().addClass('hide'); + translator.translate(msg, function (msg) { + element.html(msg); element.parent() - .removeClass('alert-success') - .addClass('alert-danger'); - element.show(); + .removeClass('show-success') + .addClass('show-danger'); }); } function showSuccess(element) { - element.find('.success').removeClass('hide').siblings().addClass('hide'); + element.html(''); element.parent() - .removeClass('alert-danger') - .addClass('alert-success'); - element.show(); + .removeClass('show-danger') + .addClass('show-success'); } return AccountEditPassword; diff --git a/public/src/client/account/edit/username.js b/public/src/client/account/edit/username.js index 64f9baa0bc..cb924a3f53 100644 --- a/public/src/client/account/edit/username.js +++ b/public/src/client/account/edit/username.js @@ -2,10 +2,10 @@ /* globals define, ajaxify, socket, app, utils, config */ -define('forum/account/edit/username', ['forum/account/header'], function(header) { +define('forum/account/edit/username', ['forum/account/header'], function (header) { var AccountEditUsername = {}; - AccountEditUsername.init = function() { + AccountEditUsername.init = function () { header.init(); $('#submitBtn').on('click', function updateUsername() { @@ -25,7 +25,7 @@ define('forum/account/edit/username', ['forum/account/header'], function(header) var btn = $(this); btn.addClass('disabled').find('i').removeClass('hide'); - socket.emit('user.changeUsernameEmail', userData, function(err, data) { + socket.emit('user.changeUsernameEmail', userData, function (err, data) { btn.removeClass('disabled').find('i').addClass('hide'); if (err) { return app.alertError(err.message); diff --git a/public/src/client/account/followers.js b/public/src/client/account/followers.js index 8a2d15f0b0..22970327fb 100644 --- a/public/src/client/account/followers.js +++ b/public/src/client/account/followers.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/followers', ['forum/account/header'], function(header) { +define('forum/account/followers', ['forum/account/header'], function (header) { var Followers = {}; - Followers.init = function() { + Followers.init = function () { header.init(); }; diff --git a/public/src/client/account/following.js b/public/src/client/account/following.js index 04230fb979..dff2f92709 100644 --- a/public/src/client/account/following.js +++ b/public/src/client/account/following.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/following', ['forum/account/header'], function(header) { +define('forum/account/following', ['forum/account/header'], function (header) { var Following = {}; - Following.init = function() { + Following.init = function () { header.init(); }; diff --git a/public/src/client/account/groups.js b/public/src/client/account/groups.js index e4c932161d..f8fe55fdd9 100644 --- a/public/src/client/account/groups.js +++ b/public/src/client/account/groups.js @@ -2,15 +2,15 @@ /* globals ajaxify, define, app, socket, utils */ -define('forum/account/groups', ['forum/account/header'], function(header) { +define('forum/account/groups', ['forum/account/header'], function (header) { var AccountTopics = {}; - AccountTopics.init = function() { + AccountTopics.init = function () { header.init(); var groupsEl = $('#groups-list'); - groupsEl.on('click', '.list-cover', function() { + groupsEl.on('click', '.list-cover', function () { var groupSlug = $(this).parents('[data-slug]').attr('data-slug'); ajaxify.go('groups/' + groupSlug); diff --git a/public/src/client/account/header.js b/public/src/client/account/header.js index 0c65653e0f..d29b58c05b 100644 --- a/public/src/client/account/header.js +++ b/public/src/client/account/header.js @@ -6,11 +6,11 @@ define('forum/account/header', [ 'uploader', 'components', 'translator' -], function(coverPhoto, uploader, components, translator) { +], function (coverPhoto, uploader, components, translator) { var AccountHeader = {}; var isAdminOrSelfOrGlobalMod; - AccountHeader.init = function() { + AccountHeader.init = function () { isAdminOrSelfOrGlobalMod = ajaxify.data.isAdmin || ajaxify.data.isSelf || ajaxify.data.isGlobalModerator; hidePrivateLinks(); @@ -20,16 +20,16 @@ define('forum/account/header', [ setupCoverPhoto(); } - components.get('account/follow').on('click', function() { + components.get('account/follow').on('click', function () { toggleFollow('follow'); }); - components.get('account/unfollow').on('click', function() { + components.get('account/unfollow').on('click', function () { toggleFollow('unfollow'); }); - components.get('account/chat').on('click', function() { - socket.emit('modules.chats.hasPrivateChat', ajaxify.data.uid, function(err, roomId) { + components.get('account/chat').on('click', function () { + socket.emit('modules.chats.hasPrivateChat', ajaxify.data.uid, function (err, roomId) { if (err) { return app.alertError(err.message); } @@ -53,7 +53,7 @@ define('forum/account/header', [ } function selectActivePill() { - $('.account-sub-links li').removeClass('active').each(function() { + $('.account-sub-links li').removeClass('active').each(function () { var href = $(this).find('a').attr('href'); if (decodeURIComponent(href) === decodeURIComponent(window.location.pathname)) { @@ -65,20 +65,20 @@ define('forum/account/header', [ function setupCoverPhoto() { coverPhoto.init(components.get('account/cover'), - function(imageData, position, callback) { + function (imageData, position, callback) { socket.emit('user.updateCover', { uid: ajaxify.data.uid, imageData: imageData, position: position }, callback); }, - function() { + function () { uploader.show({ title: '[[user:upload_cover_picture]]', route: config.relative_path + '/api/user/' + ajaxify.data.userslug + '/uploadcover', params: {uid: ajaxify.data.uid }, accept: '.png,.jpg,.bmp' - }, function(imageUrlOnServer) { + }, function (imageUrlOnServer) { components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + '?v=' + Date.now() + ')'); }); }, @@ -89,7 +89,7 @@ define('forum/account/header', [ function toggleFollow(type) { socket.emit('user.' + type, { uid: ajaxify.data.uid - }, function(err) { + }, function (err) { if (err) { return app.alertError(err.message); } @@ -102,7 +102,7 @@ define('forum/account/header', [ } function banAccount() { - templates.parse('admin/partials/temporary-ban', {}, function(html) { + templates.parse('admin/partials/temporary-ban', {}, function (html) { bootbox.dialog({ className: 'ban-modal', title: '[[user:ban_account]]', @@ -115,14 +115,14 @@ define('forum/account/header', [ }, submit: { label: '[[user:ban_account]]', - callback: function() { - var formData = $('.ban-modal form').serializeArray().reduce(function(data, cur) { + callback: function () { + var formData = $('.ban-modal form').serializeArray().reduce(function (data, cur) { data[cur.name] = cur.value; return data; }, {}); - var until = formData.length ? (Date.now() + formData.length * 1000*60*60 * (parseInt(formData.unit, 10) ? 24 : 1)) : 0; + var until = formData.length ? (Date.now() + formData.length * 1000 * 60 * 60 * (parseInt(formData.unit, 10) ? 24 : 1)) : 0; - socket.emit('user.banUsers', { uids: [ajaxify.data.theirid], until: until, reason: formData.reason || '' }, function(err) { + socket.emit('user.banUsers', { uids: [ajaxify.data.theirid], until: until, reason: formData.reason || '' }, function (err) { if (err) { return app.alertError(err.message); } @@ -136,7 +136,7 @@ define('forum/account/header', [ } function unbanAccount() { - socket.emit('user.unbanUsers', [ajaxify.data.theirid], function(err) { + socket.emit('user.unbanUsers', [ajaxify.data.theirid], function (err) { if (err) { return app.alertError(err.message); } @@ -145,13 +145,13 @@ define('forum/account/header', [ } function deleteAccount() { - translator.translate('[[user:delete_this_account_confirm]]', function(translated) { - bootbox.confirm(translated, function(confirm) { + translator.translate('[[user:delete_this_account_confirm]]', function (translated) { + bootbox.confirm(translated, function (confirm) { if (!confirm) { return; } - socket.emit('admin.user.deleteUsersAndContent', [ajaxify.data.theirid], function(err) { + socket.emit('admin.user.deleteUsersAndContent', [ajaxify.data.theirid], function (err) { if (err) { return app.alertError(err.message); } @@ -165,7 +165,7 @@ define('forum/account/header', [ function removeCover() { socket.emit('user.removeCover', { uid: ajaxify.data.uid - }, function(err) { + }, function (err) { if (!err) { ajaxify.refresh(); } else { diff --git a/public/src/client/account/info.js b/public/src/client/account/info.js index 3e1a218827..4ee76b21a3 100644 --- a/public/src/client/account/info.js +++ b/public/src/client/account/info.js @@ -2,18 +2,18 @@ /* globals define, socket, ajaxify, app */ -define('forum/account/info', ['forum/account/header'], function(header) { +define('forum/account/info', ['forum/account/header'], function (header) { var Info = {}; - Info.init = function() { + Info.init = function () { header.init(); handleModerationNote(); }; function handleModerationNote() { - $('[component="account/save-moderation-note"]').on('click', function() { + $('[component="account/save-moderation-note"]').on('click', function () { var note = $('[component="account/moderation-note"]').val(); - socket.emit('user.setModerationNote', {uid: ajaxify.data.uid, note: note}, function(err) { + socket.emit('user.setModerationNote', {uid: ajaxify.data.uid, note: note}, function (err) { if (err) { return app.alertError(err.message); } diff --git a/public/src/client/account/posts.js b/public/src/client/account/posts.js index 35e60e890b..9e2082e211 100644 --- a/public/src/client/account/posts.js +++ b/public/src/client/account/posts.js @@ -2,11 +2,11 @@ /* globals define, app, socket, utils, config, ajaxify */ -define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) { +define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) { var AccountPosts = {}; var method, template; - AccountPosts.init = function() { + AccountPosts.init = function () { header.init(); $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); @@ -14,7 +14,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], AccountPosts.handleInfiniteScroll('posts.loadMoreUserPosts', 'account/posts'); }; - AccountPosts.handleInfiniteScroll = function(_method, _template) { + AccountPosts.handleInfiniteScroll = function (_method, _template) { method = _method; template = _template; if (!config.usePagination) { @@ -30,7 +30,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], infinitescroll.loadMore(method, { uid: ajaxify.data.theirid, after: $('[component="posts"]').attr('data-nextstart') - }, function(data, done) { + }, function (data, done) { if (data.posts && data.posts.length) { onPostsLoaded(data.posts, done); } else { @@ -41,7 +41,7 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], } function onPostsLoaded(posts, callback) { - app.parseAndTranslate(template, 'posts', {posts: posts}, function(html) { + app.parseAndTranslate(template, 'posts', {posts: posts}, function (html) { $('[component="posts"]').append(html); html.find('img:not(.not-responsive)').addClass('img-responsive'); html.find('.timeago').timeago(); diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js index 0d59a96df1..f1d41db46f 100644 --- a/public/src/client/account/profile.js +++ b/public/src/client/account/profile.js @@ -7,11 +7,11 @@ define('forum/account/profile', [ 'forum/infinitescroll', 'translator', 'components' -], function(header, infinitescroll, translator) { +], function (header, infinitescroll, translator) { var Account = {}, theirid; - Account.init = function() { + Account.init = function () { header.init(); theirid = ajaxify.data.theirid; @@ -48,7 +48,7 @@ define('forum/account/profile', [ infinitescroll.loadMore('posts.loadMoreUserPosts', { after: $('[component="posts"]').attr('data-nextstart'), uid: theirid - }, function(data, done) { + }, function (data, done) { if (data.posts && data.posts.length) { onPostsLoaded(data.posts, done); } else { @@ -60,7 +60,7 @@ define('forum/account/profile', [ } function onPostsLoaded(posts, callback) { - posts = posts.filter(function(post) { + posts = posts.filter(function (post) { return !$('[component="posts"] [data-pid=' + post.pid + ']').length; }); @@ -68,7 +68,7 @@ define('forum/account/profile', [ return callback(); } - app.parseAndTranslate('account/profile', 'posts', {posts: posts}, function(html) { + app.parseAndTranslate('account/profile', 'posts', {posts: posts}, function (html) { $('[component="posts"]').append(html); html.find('.timeago').timeago(); diff --git a/public/src/client/account/settings.js b/public/src/client/account/settings.js index cc9aaf0439..6410267795 100644 --- a/public/src/client/account/settings.js +++ b/public/src/client/account/settings.js @@ -2,19 +2,19 @@ /*global define, socket, app, ajaxify, config*/ -define('forum/account/settings', ['forum/account/header', 'components', 'sounds'], function(header, components, sounds) { +define('forum/account/settings', ['forum/account/header', 'components', 'sounds'], function (header, components, sounds) { var AccountSettings = {}; - AccountSettings.init = function() { + AccountSettings.init = function () { header.init(); - $('#submitBtn').on('click', function() { + $('#submitBtn').on('click', function () { var settings = loadSettings(); if (settings.homePageRoute === 'custom' && settings.homePageCustom) { - $.get(config.relative_path + '/' + settings.homePageCustom, function() { + $.get(config.relative_path + '/' + settings.homePageCustom, function () { saveSettings(settings); - }).fail(function() { + }).fail(function () { app.alertError('[[error:invalid-home-page-route]]'); }); } else { @@ -24,7 +24,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' return false; }); - $('#bootswatchSkin').on('change', function() { + $('#bootswatchSkin').on('change', function () { var css = $('#bootswatchCSS'); var val = $(this).val() === 'default' ? config['theme:src'] : '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + $(this).val() + '/bootstrap.min.css'; @@ -33,7 +33,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' $('[data-property="homePageRoute"]').on('change', toggleCustomRoute); - $('.account').find('button[data-action="play"]').on('click', function(e) { + $('.account').find('button[data-action="play"]').on('click', function (e) { e.preventDefault(); var fileName = $(this).parent().parent().find('select').val(); @@ -49,7 +49,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' function loadSettings() { var settings = {}; - $('.account').find('input, textarea, select').each(function(id, input) { + $('.account').find('input, textarea, select').each(function (id, input) { input = $(input); var setting = input.attr('data-property'); if (input.is('select')) { @@ -72,7 +72,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' } function saveSettings(settings) { - socket.emit('user.saveSettings', {uid: ajaxify.data.theirid, settings: settings}, function(err, newSettings) { + socket.emit('user.saveSettings', {uid: ajaxify.data.theirid, settings: settings}, function (err, newSettings) { if (err) { return app.alertError(err.message); } @@ -98,7 +98,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' message: '[[user:settings-require-reload]]', type: 'warning', timeout: 5000, - clickfn: function() { + clickfn: function () { ajaxify.refresh(); } }); @@ -116,7 +116,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' } function prepareSessionRevoking() { - components.get('user/sessions').on('click', '[data-action]', function() { + components.get('user/sessions').on('click', '[data-action]', function () { var parentEl = $(this).parents('[data-uuid]'); var uuid = parentEl.attr('data-uuid'); @@ -129,9 +129,9 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds' headers: { 'x-csrf-token': config.csrf_token } - }).done(function() { + }).done(function () { parentEl.remove(); - }).fail(function(err) { + }).fail(function (err) { try { var errorObj = JSON.parse(err.responseText); if (errorObj.loggedIn === false) { diff --git a/public/src/client/account/topics.js b/public/src/client/account/topics.js index 1fefc727d1..63658f0cbf 100644 --- a/public/src/client/account/topics.js +++ b/public/src/client/account/topics.js @@ -2,17 +2,17 @@ /* globals define, app, socket, utils, config, ajaxify */ -define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function(header, infinitescroll) { +define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) { var AccountTopics = {}; var template, set; - AccountTopics.init = function() { + AccountTopics.init = function () { header.init(); AccountTopics.handleInfiniteScroll('account/topics', 'uid:' + ajaxify.data.theirid + ':topics'); }; - AccountTopics.handleInfiniteScroll = function(_template, _set) { + AccountTopics.handleInfiniteScroll = function (_template, _set) { template = _template; set = _set; @@ -29,7 +29,7 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], infinitescroll.loadMore('topics.loadMoreFromSet', { set: set, after: $('[component="category"]').attr('data-nextstart') - }, function(data, done) { + }, function (data, done) { if (data.topics && data.topics.length) { onTopicsLoaded(data.topics, done); } else { @@ -41,7 +41,7 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], } function onTopicsLoaded(topics, callback) { - app.parseAndTranslate('account/topics', 'topics', {topics: topics}, function(html) { + app.parseAndTranslate('account/topics', 'topics', {topics: topics}, function (html) { $('[component="category"]').append(html); html.find('.timeago').timeago(); app.createUserTooltips(); diff --git a/public/src/client/account/upvoted.js b/public/src/client/account/upvoted.js index 1d0ef86294..76bf001b77 100644 --- a/public/src/client/account/upvoted.js +++ b/public/src/client/account/upvoted.js @@ -2,10 +2,10 @@ /* globals define */ -define('forum/account/upvoted', ['forum/account/header', 'forum/account/posts'], function(header, posts) { +define('forum/account/upvoted', ['forum/account/header', 'forum/account/posts'], function (header, posts) { var Upvoted = {}; - Upvoted.init = function() { + Upvoted.init = function () { header.init(); $('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive'); diff --git a/public/src/client/account/watched.js b/public/src/client/account/watched.js index dae195df2d..4e1ca01cfe 100644 --- a/public/src/client/account/watched.js +++ b/public/src/client/account/watched.js @@ -1,10 +1,10 @@ 'use strict'; /* globals define, app, socket, utils */ -define('forum/account/watched', ['forum/account/header', 'forum/account/topics'], function(header, topics) { +define('forum/account/watched', ['forum/account/header', 'forum/account/topics'], function (header, topics) { var AccountWatched = {}; - AccountWatched.init = function() { + AccountWatched.init = function () { header.init(); topics.handleInfiniteScroll('account/watched', 'uid:' + ajaxify.data.theirid + ':followed_tids'); diff --git a/public/src/client/categories.js b/public/src/client/categories.js index a73ed617bb..672fa38cf9 100644 --- a/public/src/client/categories.js +++ b/public/src/client/categories.js @@ -2,16 +2,16 @@ /* globals define, socket, app, templates, ajaxify*/ -define('forum/categories', ['components', 'translator'], function(components, translator) { +define('forum/categories', ['components', 'translator'], function (components, translator) { var categories = {}; - $(window).on('action:ajaxify.start', function(ev, data) { + $(window).on('action:ajaxify.start', function (ev, data) { if (ajaxify.currentPage !== data.url) { socket.removeListener('event:new_post', categories.onNewPost); } }); - categories.init = function() { + categories.init = function () { app.enterRoom('categories'); socket.removeListener('event:new_post', categories.onNewPost); @@ -22,7 +22,7 @@ define('forum/categories', ['components', 'translator'], function(components, tr }); }; - categories.onNewPost = function(data) { + categories.onNewPost = function (data) { if (data && data.posts && data.posts.length && data.posts[0].topic) { renderNewPost(data.posts[0].topic.cid, data.posts[0]); } @@ -38,7 +38,7 @@ define('forum/categories', ['components', 'translator'], function(components, tr var recentPosts = category.find('[component="category/posts"]'); var insertBefore = recentPosts.first(); - parseAndTranslate([post], function(html) { + parseAndTranslate([post], function (html) { html.hide(); if(recentPosts.length === 0) { html.appendTo(category); @@ -60,8 +60,8 @@ define('forum/categories', ['components', 'translator'], function(components, tr } function parseAndTranslate(posts, callback) { - templates.parse('categories', '(categories.)?posts', {categories: {posts: posts}}, function(html) { - translator.translate(html, function(translatedHTML) { + templates.parse('categories', '(categories.)?posts', {categories: {posts: posts}}, function (html) { + translator.translate(html, function (translatedHTML) { translatedHTML = $(translatedHTML); translatedHTML.find('img:not(.not-responsive)').addClass('img-responsive'); diff --git a/public/src/client/category.js b/public/src/client/category.js index d0a6d37f2a..7f64fd4f7f 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -11,10 +11,10 @@ define('forum/category', [ 'translator', 'topicSelect', 'forum/pagination' -], function(infinitescroll, share, navigator, categoryTools, sort, components, translator, topicSelect, pagination) { +], function (infinitescroll, share, navigator, categoryTools, sort, components, translator, topicSelect, pagination) { var Category = {}; - $(window).on('action:ajaxify.start', function(ev, data) { + $(window).on('action:ajaxify.start', function (ev, data) { if (ajaxify.currentPage !== data.url) { navigator.disable(); @@ -27,7 +27,7 @@ define('forum/category', [ categoryTools.removeListeners(); } - Category.init = function() { + Category.init = function () { var cid = ajaxify.data.cid; app.enterRoom('category_' + cid); @@ -47,9 +47,9 @@ define('forum/category', [ enableInfiniteLoadingOrPagination(); - $('[component="category"]').on('click', '[component="topic/header"]', function() { + $('[component="category"]').on('click', '[component="topic/header"]', function () { var clickedIndex = $(this).parents('[data-index]').attr('data-index'); - $('[component="category/topic"]').each(function(index, el) { + $('[component="category/topic"]').each(function (index, el) { if ($(el).offset().top - $(window).scrollTop() > 0) { localStorage.setItem('category:' + cid + ':bookmark', $(el).attr('data-index')); localStorage.setItem('category:' + cid + ':bookmark:clicked', clickedIndex); @@ -65,11 +65,11 @@ define('forum/category', [ }; function handleIgnoreWatch(cid) { - $('[component="category/watching"], [component="category/ignoring"]').on('click', function() { + $('[component="category/watching"], [component="category/ignoring"]').on('click', function () { var $this = $(this); var command = $this.attr('component') === 'category/watching' ? 'watch' : 'ignore'; - socket.emit('categories.' + command, cid, function(err) { + socket.emit('categories.' + command, cid, function (err) { if (err) { return app.alertError(err.message); } @@ -85,12 +85,12 @@ define('forum/category', [ }); } - Category.toTop = function() { + Category.toTop = function () { navigator.scrollTop(0); }; - Category.toBottom = function() { - socket.emit('categories.getTopicCount', ajaxify.data.cid, function(err, count) { + Category.toBottom = function () { + socket.emit('categories.getTopicCount', ajaxify.data.cid, function (err, count) { if (err) { return app.alertError(err.message); } @@ -99,11 +99,11 @@ define('forum/category', [ }); }; - Category.navigatorCallback = function(topIndex, bottomIndex, elementCount) { + Category.navigatorCallback = function (topIndex, bottomIndex, elementCount) { return bottomIndex; }; - $(window).on('action:popstate', function(ev, data) { + $(window).on('action:popstate', function (ev, data) { if (data.url.startsWith('category/')) { var cid = data.url.match(/^category\/(\d+)/); if (cid && cid[1]) { @@ -125,7 +125,7 @@ define('forum/category', [ if (config.usePagination) { var page = Math.ceil((parseInt(bookmarkIndex, 10) + 1) / config.topicsPerPage); if (parseInt(page, 10) !== ajaxify.data.pagination.currentPage) { - pagination.loadPage(page, function() { + pagination.loadPage(page, function () { Category.scrollToTopic(bookmarkIndex, clickedIndex, 400); }); } else { @@ -139,25 +139,25 @@ define('forum/category', [ $('[component="category"]').empty(); - loadTopicsAfter(Math.max(0, bookmarkIndex - 1), 1, function() { + loadTopicsAfter(Math.max(0, bookmarkIndex - 1), 1, function () { Category.scrollToTopic(bookmarkIndex, clickedIndex, 0); }); } } }); - Category.highlightTopic = function(topicIndex) { + Category.highlightTopic = function (topicIndex) { var highlight = components.get('category/topic', 'index', topicIndex); if (highlight.length && !highlight.hasClass('highlight')) { highlight.addClass('highlight'); - setTimeout(function() { + setTimeout(function () { highlight.removeClass('highlight'); }, 5000); } }; - Category.scrollToTopic = function(bookmarkIndex, clickedIndex, duration, offset) { + Category.scrollToTopic = function (bookmarkIndex, clickedIndex, duration, offset) { if (!bookmarkIndex) { return; } @@ -172,7 +172,7 @@ define('forum/category', [ if (scrollTo.length && cid) { $('html, body').animate({ scrollTop: (scrollTo.offset().top - offset) + 'px' - }, duration !== undefined ? duration : 400, function() { + }, duration !== undefined ? duration : 400, function () { Category.highlightTopic(clickedIndex); navigator.update(); }); @@ -187,7 +187,7 @@ define('forum/category', [ } } - Category.onNewTopic = function(topic) { + Category.onNewTopic = function (topic) { var cid = ajaxify.data.cid; if (!topic || parseInt(topic.cid, 10) !== parseInt(cid, 10)) { return; @@ -202,8 +202,8 @@ define('forum/category', [ showSelect: editable, topics: [topic], template: {category: true} - }, function(html) { - translator.translate(html, function(translatedHTML) { + }, function (html) { + translator.translate(html, function (translatedHTML) { var topic = $(translatedHTML), container = $('[component="category"]'), topics = $('[component="category/topic"]'), @@ -246,7 +246,7 @@ define('forum/category', [ }; function updateTopicCount() { - socket.emit('categories.getTopicCount', ajaxify.data.cid, function(err, topicCount) { + socket.emit('categories.getTopicCount', ajaxify.data.cid, function (err, topicCount) { if(err) { return app.alertError(err.message); } @@ -254,7 +254,7 @@ define('forum/category', [ }); } - Category.loadMoreTopics = function(direction) { + Category.loadMoreTopics = function (direction) { if (!$('[component="category"]').length || !$('[component="category"]').children().length) { return; } @@ -267,7 +267,7 @@ define('forum/category', [ }; function loadTopicsAfter(after, direction, callback) { - callback = callback || function() {}; + callback = callback || function () {}; if (!utils.isNumber(after) || (after === 0 && components.get('category/topic', 'index', 0).length)) { return callback(); } @@ -294,13 +294,13 @@ define('forum/category', [ } - Category.onTopicsLoaded = function(data, direction, callback) { + Category.onTopicsLoaded = function (data, direction, callback) { if (!data || !data.topics.length) { return callback(); } function removeAlreadyAddedTopics(topics) { - return topics.filter(function(topic) { + return topics.filter(function (topic) { return components.get('category/topic', 'tid', topic.tid).length === 0; }); } @@ -321,7 +321,7 @@ define('forum/category', [ before = topics.first(); } - app.parseAndTranslate('category', 'topics', data, function(html) { + app.parseAndTranslate('category', 'topics', data, function (html) { $('[component="category"]').removeClass('hidden'); $('.category-sidebar').removeClass('hidden'); diff --git a/public/src/client/categoryTools.js b/public/src/client/categoryTools.js index 8344ddf355..548386ffc6 100644 --- a/public/src/client/categoryTools.js +++ b/public/src/client/categoryTools.js @@ -4,31 +4,31 @@ /* globals define, app, socket, bootbox, ajaxify */ -define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', 'translator'], function(move, topicSelect, components, translator) { +define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', 'translator'], function (move, topicSelect, components, translator) { var CategoryTools = {}; - CategoryTools.init = function(cid) { + CategoryTools.init = function (cid) { CategoryTools.cid = cid; topicSelect.init(updateDropdownOptions); - components.get('topic/delete').on('click', function() { + components.get('topic/delete').on('click', function () { categoryCommand('delete', topicSelect.getSelectedTids()); return false; }); - components.get('topic/restore').on('click', function() { + components.get('topic/restore').on('click', function () { categoryCommand('restore', topicSelect.getSelectedTids()); return false; }); - components.get('topic/purge').on('click', function() { + components.get('topic/purge').on('click', function () { categoryCommand('purge', topicSelect.getSelectedTids()); return false; }); - components.get('topic/lock').on('click', function() { + components.get('topic/lock').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { socket.emit('topics.lock', {tids: tids, cid: CategoryTools.cid}, onCommandComplete); @@ -36,7 +36,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/unlock').on('click', function() { + components.get('topic/unlock').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { socket.emit('topics.unlock', {tids: tids, cid: CategoryTools.cid}, onCommandComplete); @@ -44,7 +44,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/pin').on('click', function() { + components.get('topic/pin').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { socket.emit('topics.pin', {tids: tids, cid: CategoryTools.cid}, onCommandComplete); @@ -52,7 +52,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/unpin').on('click', function() { + components.get('topic/unpin').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { socket.emit('topics.unpin', {tids: tids, cid: CategoryTools.cid}, onCommandComplete); @@ -60,15 +60,15 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/mark-unread-for-all').on('click', function() { + components.get('topic/mark-unread-for-all').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { - socket.emit('topics.markAsUnreadForAll', tids, function(err) { + socket.emit('topics.markAsUnreadForAll', tids, function (err) { if (err) { return app.alertError(err.message); } app.alertSuccess('[[topic:markAsUnreadForAll.success]]'); - tids.forEach(function(tid) { + tids.forEach(function (tid) { $('[component="category/topic"][data-tid="' + tid + '"]').addClass('unread'); }); onCommandComplete(); @@ -78,7 +78,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/move').on('click', function() { + components.get('topic/move').on('click', function () { var tids = topicSelect.getSelectedTids(); if (tids.length) { @@ -87,8 +87,8 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return false; }); - components.get('topic/move-all').on('click', function() { - move.init(null, cid, function(err) { + components.get('topic/move-all').on('click', function () { + move.init(null, cid, function (err) { if (err) { return app.alertError(err.message); } @@ -113,8 +113,8 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', return; } - translator.translate('[[topic:thread_tools.' + command + '_confirm]]', function(msg) { - bootbox.confirm(msg, function(confirm) { + translator.translate('[[topic:thread_tools.' + command + '_confirm]]', function (msg) { + bootbox.confirm(msg, function (confirm) { if (!confirm) { return; } @@ -124,7 +124,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', }); } - CategoryTools.removeListeners = function() { + CategoryTools.removeListeners = function () { socket.removeListener('event:topic_deleted', setDeleteState); socket.removeListener('event:topic_restored', setDeleteState); socket.removeListener('event:topic_purged', onTopicPurged); @@ -175,7 +175,7 @@ define('forum/categoryTools', ['forum/topic/move', 'topicSelect', 'components', } function isAny(method, tids) { - for(var i=0; i[[users:no-users-found]]
');
@@ -276,7 +276,7 @@
for (var i = envs.length - 1; i >= 0; i--) {
var env = envs[i];
- $el.addClass('hidden-'+env);
+ $el.addClass('hidden-' + env);
if ($el.is(':hidden')) {
$el.remove();
return env;
@@ -284,14 +284,14 @@
}
},
- isMobile: function() {
+ isMobile: function () {
var env = utils.findBootstrapEnvironment();
- return ['xs', 'sm'].some(function(targetEnv) {
+ return ['xs', 'sm'].some(function (targetEnv) {
return targetEnv === env;
});
},
- getHoursArray: function() {
+ getHoursArray: function () {
var currentHour = new Date().getHours(),
labels = [];
@@ -303,14 +303,14 @@
return labels.reverse();
},
- getDaysArray: function(from) {
+ getDaysArray: function (from) {
var currentDay = new Date(from || Date.now()).getTime(),
months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
labels = [],
tmpDate;
- for(var x=29;x>=0;x--) {
- tmpDate = new Date(currentDay - (1000*60*60*24*x));
+ for(var x = 29;x >= 0;x--) {
+ tmpDate = new Date(currentDay - (1000 * 60 * 60 * 24 * x));
labels.push(months[tmpDate.getMonth()] + ' ' + tmpDate.getDate());
}
@@ -318,7 +318,7 @@
},
/* Retrieved from http://stackoverflow.com/a/7557433 @ 27 Mar 2016 */
- isElementInViewport: function(el) {
+ isElementInViewport: function (el) {
//special bonus for those using jQuery
if (typeof jQuery === "function" && el instanceof jQuery) {
el = el[0];
@@ -335,7 +335,7 @@
},
// get all the url params in a single key/value hash
- params: function(options) {
+ params: function (options) {
var a, hash = {}, params;
options = options || {};
@@ -346,7 +346,7 @@
}
params = (a ? a.search : window.location.search).substring(1).split("&");
- params.forEach(function(param) {
+ params.forEach(function (param) {
var val = param.split('='),
key = decodeURI(val[0]),
value = options.skipToType[key] ? decodeURI(val[1]) : utils.toType(decodeURI(val[1]));
@@ -368,11 +368,11 @@
return hash;
},
- param: function(key) {
+ param: function (key) {
return this.params()[key];
},
- urlToLocation: function(url) {
+ urlToLocation: function (url) {
var a = document.createElement('a');
a.href = url;
return a;
@@ -380,7 +380,7 @@
// return boolean if string 'true' or string 'false', or if a parsable string which is a number
// also supports JSON object and/or arrays parsing
- toType: function(str) {
+ toType: function (str) {
var type = typeof str;
if (type !== 'string') {
return str;
@@ -409,7 +409,7 @@
// get example: utils.props(A, 'a.b.c') // returns {d: 10}
// get example: utils.props(A, 'a.b.c.foo.bar') // returns undefined without throwing a TypeError
// credits to github.com/gkindel
- props: function(obj, props, value) {
+ props: function (obj, props, value) {
if(obj === undefined) {
obj = window;
}
@@ -433,7 +433,7 @@
return utils.props(obj[prop], newProps, value);
},
- isInternalURI: function(targetLocation, referenceLocation, relative_path) {
+ isInternalURI: function (targetLocation, referenceLocation, relative_path) {
return targetLocation.host === '' || // Relative paths are always internal links
(
targetLocation.host === referenceLocation.host && targetLocation.protocol === referenceLocation.protocol && // Otherwise need to check if protocol and host match
@@ -455,13 +455,13 @@
}
if (typeof String.prototype.endsWith != 'function') {
- String.prototype.endsWith = function(suffix) {
+ String.prototype.endsWith = function (suffix) {
if (this.length < suffix.length) {
return false;
}
var len = this.length;
var suffixLen = suffix.length;
- for (var i=1; (i <= suffixLen && this[len - i] === suffix[suffixLen - i]); ++i) {
+ for (var i = 1; (i <= suffixLen && this[len - i] === suffix[suffixLen - i]); ++i) {
continue;
}
return i > suffixLen;
@@ -469,7 +469,7 @@
}
if (typeof String.prototype.rtrim != 'function') {
- String.prototype.rtrim = function() {
+ String.prototype.rtrim = function () {
return this.replace(/\s+$/g, '');
};
}
@@ -478,8 +478,8 @@
window.utils = module.exports;
}
-})('undefined' === typeof module ? {
+}('undefined' === typeof module ? {
module: {
exports: {}
}
-} : module);
+} : module));
diff --git a/public/src/widgets.js b/public/src/widgets.js
index ffa539c6ff..8d4eb10e1f 100644
--- a/public/src/widgets.js
+++ b/public/src/widgets.js
@@ -1,102 +1,89 @@
"use strict";
-/*global ajaxify, templates, config, RELATIVE_PATH*/
+/*global ajaxify, templates, config, utils*/
-(function(ajaxify) {
+(function (ajaxify) {
ajaxify.widgets = {};
- ajaxify.widgets.reposition = function(location) {
- $('body [no-widget-class]').each(function() {
+ ajaxify.widgets.reposition = function (location) {
+ $('body [has-widget-class]').each(function () {
var $this = $(this);
- if ($this.attr('no-widget-target') === location) {
+ if ($this.attr('has-widget-target') === location) {
$this.removeClass();
- $this.addClass($this.attr('no-widget-class'));
+ $this.addClass($this.attr('has-widget-class'));
}
});
};
- ajaxify.widgets.render = function(template, url, callback) {
+ ajaxify.widgets.render = function (template, url, callback) {
+ callback = callback || function () {};
if (template.match(/^admin/)) {
return callback();
}
- var widgetLocations = ['sidebar', 'footer', 'header'], numLocations;
+ var widgetLocations = ['sidebar', 'footer', 'header'];
- $('#content [widget-area]').each(function() {
+ $('#content [widget-area]').each(function () {
var location = $(this).attr('widget-area');
if ($.inArray(location, widgetLocations) === -1) {
widgetLocations.push(location);
}
});
- numLocations = widgetLocations.length;
+ $.get(config.relative_path + '/api/widgets/render' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), {
+ locations: widgetLocations,
+ template: template + '.tpl',
+ url: url,
+ isMobile: utils.isMobile()
+ }, function (renderedAreas) {
+ for (var x = 0; x < renderedAreas.length; ++x) {
+ var renderedWidgets = renderedAreas[x].widgets;
+ var location = renderedAreas[x].location;
+ var html = '';
- if (!numLocations) {
- ajaxify.widgets.reposition();
- }
+ for (var i = 0; i < renderedWidgets.length; ++i) {
+ html += templates.parse(renderedWidgets[i].html, {});
+ }
- function renderWidgets(locations) {
- var areaDatas = [];
+ var area = $('#content [widget-area="' + location + '"]');
- $.get(RELATIVE_PATH + '/api/widgets/render' + (config['cache-buster'] ? '?v=' + config['cache-buster'] : ''), {
- locations: locations,
- template: template + '.tpl',
- url: url,
- isMobile: utils.isMobile()
- }, function(renderedAreas) {
- for (var x=0; x
'));
- } else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) {
- if ($('[component="account/cover"]').length) {
- $('[component="account/cover"]').nextAll().wrapAll($(''));
- } else if ($('[component="groups/cover"]').length) {
- $('[component="groups/cover"]').nextAll().wrapAll($('
'));
- } else {
- $('#content > *').wrapAll($('
'));
- }
- } else if (location === 'header' && !$('#content [widget-area="header"]').length) {
- $('#content').prepend($('
'));
+ if (!area.length && window.location.pathname.indexOf('/admin') === -1 && renderedWidgets.length) {
+ if (location === 'footer' && !$('#content [widget-area="footer"]').length) {
+ $('#content').append($('
'));
+ } else if (location === 'sidebar' && !$('#content [widget-area="sidebar"]').length) {
+ if ($('[component="account/cover"]').length) {
+ $('[component="account/cover"]').nextAll().wrapAll($('
'));
+ } else if ($('[component="groups/cover"]').length) {
+ $('[component="groups/cover"]').nextAll().wrapAll($('
'));
+ } else {
+ $('#content > *').wrapAll($('
'));
}
-
- area = $('#content [widget-area="' + location + '"]');
+ } else if (location === 'header' && !$('#content [widget-area="header"]').length) {
+ $('#content').prepend($('
'));
}
- area.html(html);
-
- if (!renderedWidgets.length) {
- area.addClass('hidden');
- ajaxify.widgets.reposition(location);
- }
+ area = $('#content [widget-area="' + location + '"]');
}
- var widgetAreas = $('#content [widget-area]');
- widgetAreas.find('img:not(.not-responsive)').addClass('img-responsive');
- widgetAreas.find('.timeago').timeago();
- widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function() {
- $(this).tooltip({
- placement: 'top',
- title: $(this).attr('title')
- });
+ area.html(html);
+
+ if (renderedWidgets.length) {
+ area.removeClass('hidden');
+ ajaxify.widgets.reposition(location);
+ }
+ }
+
+ var widgetAreas = $('#content [widget-area]');
+ widgetAreas.find('img:not(.not-responsive)').addClass('img-responsive');
+ widgetAreas.find('.timeago').timeago();
+ widgetAreas.find('img[title].teaser-pic,img[title].user-img').each(function () {
+ $(this).tooltip({
+ placement: 'top',
+ title: $(this).attr('title')
});
- $(window).trigger('action:widgets.loaded', {});
-
- if (typeof callback === 'function') {
- callback();
- }
});
- }
+ $(window).trigger('action:widgets.loaded', {});
- renderWidgets(widgetLocations);
+ callback(renderedAreas);
+ });
};
}(ajaxify || {}));
diff --git a/src/analytics.js b/src/analytics.js
index bbb1c06794..ab834b75b2 100644
--- a/src/analytics.js
+++ b/src/analytics.js
@@ -6,7 +6,7 @@ var winston = require('winston');
var db = require('./database');
-(function(Analytics) {
+(function (Analytics) {
var counters = {};
var pageViews = 0;
@@ -15,24 +15,24 @@ var db = require('./database');
var isCategory = /^(?:\/api)?\/category\/(\d+)/;
- new cronJob('*/10 * * * *', function() {
+ new cronJob('*/10 * * * *', function () {
Analytics.writeData();
}, null, true);
- Analytics.increment = function(keys) {
+ Analytics.increment = function (keys) {
keys = Array.isArray(keys) ? keys : [keys];
- keys.forEach(function(key) {
+ keys.forEach(function (key) {
counters[key] = counters[key] || 0;
++counters[key];
});
};
- Analytics.pageView = function(payload) {
+ Analytics.pageView = function (payload) {
++pageViews;
if (payload.ip) {
- db.sortedSetScore('ip:recent', payload.ip, function(err, score) {
+ db.sortedSetScore('ip:recent', payload.ip, function (err, score) {
if (err) {
return;
}
@@ -58,7 +58,7 @@ var db = require('./database');
}
};
- Analytics.writeData = function() {
+ Analytics.writeData = function () {
var today = new Date();
var month = new Date();
var dbQueue = [];
@@ -92,14 +92,14 @@ var db = require('./database');
}
}
- async.parallel(dbQueue, function(err) {
+ async.parallel(dbQueue, function (err) {
if (err) {
winston.error('[analytics] Encountered error while writing analytics to data store: ' + err.message);
}
});
};
- Analytics.getHourlyStatsForSet = function(set, hour, numHours, callback) {
+ Analytics.getHourlyStatsForSet = function (set, hour, numHours, callback) {
var terms = {},
hoursArr = [];
@@ -111,19 +111,19 @@ var db = require('./database');
hour.setHours(hour.getHours() - 1, 0, 0, 0);
}
- db.sortedSetScores(set, hoursArr, function(err, counts) {
+ db.sortedSetScores(set, hoursArr, function (err, counts) {
if (err) {
return callback(err);
}
- hoursArr.forEach(function(term, index) {
+ hoursArr.forEach(function (term, index) {
terms[term] = parseInt(counts[index], 10) || 0;
});
var termsArr = [];
hoursArr.reverse();
- hoursArr.forEach(function(hour) {
+ hoursArr.forEach(function (hour) {
termsArr.push(terms[hour]);
});
@@ -131,36 +131,36 @@ var db = require('./database');
});
};
- Analytics.getDailyStatsForSet = function(set, day, numDays, callback) {
+ Analytics.getDailyStatsForSet = function (set, day, numDays, callback) {
var daysArr = [];
day = new Date(day);
- day.setDate(day.getDate()+1); // set the date to tomorrow, because getHourlyStatsForSet steps *backwards* 24 hours to sum up the values
+ day.setDate(day.getDate() + 1); // set the date to tomorrow, because getHourlyStatsForSet steps *backwards* 24 hours to sum up the values
day.setHours(0, 0, 0, 0);
- async.whilst(function() {
+ async.whilst(function () {
return numDays--;
- }, function(next) {
- Analytics.getHourlyStatsForSet(set, day.getTime()-(1000*60*60*24*numDays), 24, function(err, day) {
+ }, function (next) {
+ Analytics.getHourlyStatsForSet(set, day.getTime() - (1000 * 60 * 60 * 24 * numDays), 24, function (err, day) {
if (err) {
return next(err);
}
- daysArr.push(day.reduce(function(cur, next) {
- return cur+next;
+ daysArr.push(day.reduce(function (cur, next) {
+ return cur + next;
}));
next();
});
- }, function(err) {
+ }, function (err) {
callback(err, daysArr);
});
};
- Analytics.getUnwrittenPageviews = function() {
+ Analytics.getUnwrittenPageviews = function () {
return pageViews;
};
- Analytics.getMonthlyPageViews = function(callback) {
+ Analytics.getMonthlyPageViews = function (callback) {
var thisMonth = new Date();
var lastMonth = new Date();
thisMonth.setMonth(thisMonth.getMonth(), 1);
@@ -170,7 +170,7 @@ var db = require('./database');
var values = [thisMonth.getTime(), lastMonth.getTime()];
- db.sortedSetScores('analytics:pageviews:month', values, function(err, scores) {
+ db.sortedSetScores('analytics:pageviews:month', values, function (err, scores) {
if (err) {
return callback(err);
}
@@ -178,7 +178,7 @@ var db = require('./database');
});
};
- Analytics.getCategoryAnalytics = function(cid, callback) {
+ Analytics.getCategoryAnalytics = function (cid, callback) {
async.parallel({
'pageviews:hourly': async.apply(Analytics.getHourlyStatsForSet, 'analytics:pageviews:byCid:' + cid, Date.now(), 24),
'pageviews:daily': async.apply(Analytics.getDailyStatsForSet, 'analytics:pageviews:byCid:' + cid, Date.now(), 30),
@@ -187,7 +187,7 @@ var db = require('./database');
}, callback);
};
- Analytics.getErrorAnalytics = function(callback) {
+ Analytics.getErrorAnalytics = function (callback) {
async.parallel({
'not-found': async.apply(Analytics.getDailyStatsForSet, 'analytics:errors:404', Date.now(), 7),
'toobusy': async.apply(Analytics.getDailyStatsForSet, 'analytics:errors:503', Date.now(), 7)
diff --git a/src/batch.js b/src/batch.js
index 1a425e1a21..ca0944b80d 100644
--- a/src/batch.js
+++ b/src/batch.js
@@ -6,17 +6,17 @@ var async = require('async'),
db = require('./database'),
utils = require('../public/src/utils');
-(function(Batch) {
+(function (Batch) {
var DEFAULT_BATCH_SIZE = 100;
- Batch.processSortedSet = function(setKey, process, options, callback) {
+ Batch.processSortedSet = function (setKey, process, options, callback) {
if (typeof options === 'function') {
callback = options;
options = {};
}
- callback = typeof callback === 'function' ? callback : function(){};
+ callback = typeof callback === 'function' ? callback : function () {};
options = options || {};
if (typeof process !== 'function') {
@@ -29,7 +29,7 @@ var async = require('async'),
}
// custom done condition
- options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function(){};
+ options.doneIf = typeof options.doneIf === 'function' ? options.doneIf : function (){};
var batch = options.batch || DEFAULT_BATCH_SIZE;
var start = 0;
@@ -37,11 +37,11 @@ var async = require('async'),
var done = false;
async.whilst(
- function() {
+ function () {
return !done;
},
- function(next) {
- db.getSortedSetRange(setKey, start, stop, function(err, ids) {
+ function (next) {
+ db.getSortedSetRange(setKey, start, stop, function (err, ids) {
if (err) {
return next(err);
}
@@ -49,7 +49,7 @@ var async = require('async'),
done = true;
return next();
}
- process(ids, function(err) {
+ process(ids, function (err) {
if (err) {
return next(err);
}
@@ -63,4 +63,52 @@ var async = require('async'),
);
};
+ Batch.processArray = function (array, process, options, callback) {
+ if (typeof options === 'function') {
+ callback = options;
+ options = {};
+ }
+
+ callback = typeof callback === 'function' ? callback : function () {};
+ options = options || {};
+
+ if (!Array.isArray(array) || !array.length) {
+ return callback();
+ }
+ if (typeof process !== 'function') {
+ return callback(new Error('[[error:process-not-a-function]]'));
+ }
+
+ var batch = options.batch || DEFAULT_BATCH_SIZE;
+ var start = 0;
+ var done = false;
+
+ async.whilst(
+ function () {
+ return !done;
+ },
+ function (next) {
+ var currentBatch = array.slice(start, start + batch);
+ if (!currentBatch.length) {
+ done = true;
+ return next();
+ }
+ process(currentBatch, function (err) {
+ if (err) {
+ return next(err);
+ }
+ start = start + batch;
+ if (options.interval) {
+ setTimeout(next, options.interval);
+ } else {
+ next();
+ }
+ });
+ },
+ function (err) {
+ callback(err);
+ }
+ );
+ };
+
}(exports));
diff --git a/src/categories.js b/src/categories.js
index e058a452e6..4e2c435f8e 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -9,7 +9,7 @@ var Groups = require('./groups');
var plugins = require('./plugins');
var privileges = require('./privileges');
-(function(Categories) {
+(function (Categories) {
require('./categories/data')(Categories);
require('./categories/create')(Categories);
@@ -20,11 +20,11 @@ var privileges = require('./privileges');
require('./categories/recentreplies')(Categories);
require('./categories/update')(Categories);
- Categories.exists = function(cid, callback) {
+ Categories.exists = function (cid, callback) {
db.isSortedSetMember('categories:cid', cid, callback);
};
- Categories.getCategoryById = function(data, callback) {
+ Categories.getCategoryById = function (data, callback) {
var category;
async.waterfall([
function (next) {
@@ -37,17 +37,17 @@ var privileges = require('./privileges');
category = categories[0];
async.parallel({
- topics: function(next) {
+ topics: function (next) {
Categories.getCategoryTopics(data, next);
},
- topicCount: function(next) {
+ topicCount: function (next) {
if (Array.isArray(data.set)) {
db.sortedSetIntersectCard(data.set, next);
} else {
next(null, category.topic_count);
}
},
- isIgnored: function(next) {
+ isIgnored: function (next) {
Categories.isIgnored([data.cid], data.uid, next);
}
}, next);
@@ -66,24 +66,24 @@ var privileges = require('./privileges');
], callback);
};
- Categories.isIgnored = function(cids, uid, callback) {
- user.getIgnoredCategories(uid, function(err, ignoredCids) {
+ Categories.isIgnored = function (cids, uid, callback) {
+ user.getIgnoredCategories(uid, function (err, ignoredCids) {
if (err) {
return callback(err);
}
- cids = cids.map(function(cid) {
+ cids = cids.map(function (cid) {
return ignoredCids.indexOf(cid.toString()) !== -1;
});
callback(null, cids);
});
};
- Categories.getPageCount = function(cid, uid, callback) {
+ Categories.getPageCount = function (cid, uid, callback) {
async.parallel({
topicCount: async.apply(Categories.getCategoryField, cid, 'topic_count'),
settings: async.apply(user.getSettings, uid)
- }, function(err, results) {
+ }, function (err, results) {
if (err) {
return callback(err);
}
@@ -96,8 +96,8 @@ var privileges = require('./privileges');
});
};
- Categories.getAllCategories = function(uid, callback) {
- db.getSortedSetRange('categories:cid', 0, -1, function(err, cids) {
+ Categories.getAllCategories = function (uid, callback) {
+ db.getSortedSetRange('categories:cid', 0, -1, function (err, cids) {
if (err || !Array.isArray(cids) || !cids.length) {
return callback(err, []);
}
@@ -106,22 +106,22 @@ var privileges = require('./privileges');
});
};
- Categories.getCategoriesByPrivilege = function(set, uid, privilege, callback) {
+ Categories.getCategoriesByPrivilege = function (set, uid, privilege, callback) {
async.waterfall([
- function(next) {
+ function (next) {
db.getSortedSetRange(set, 0, -1, next);
},
- function(cids, next) {
+ function (cids, next) {
privileges.categories.filterCids(privilege, cids, uid, next);
},
- function(cids, next) {
+ function (cids, next) {
Categories.getCategories(cids, uid, next);
}
], callback);
};
- Categories.getModerators = function(cid, callback) {
- Groups.getMembers('cid:' + cid + ':privileges:mods', 0, -1, function(err, uids) {
+ Categories.getModerators = function (cid, callback) {
+ Groups.getMembers('cid:' + cid + ':privileges:mods', 0, -1, function (err, uids) {
if (err || !Array.isArray(uids) || !uids.length) {
return callback(err, []);
}
@@ -131,7 +131,7 @@ var privileges = require('./privileges');
};
- Categories.getCategories = function(cids, uid, callback) {
+ Categories.getCategories = function (cids, uid, callback) {
if (!Array.isArray(cids)) {
return callback(new Error('[[error:invalid-cid]]'));
}
@@ -141,19 +141,19 @@ var privileges = require('./privileges');
}
async.parallel({
- categories: function(next) {
+ categories: function (next) {
Categories.getCategoriesData(cids, next);
},
- children: function(next) {
+ children: function (next) {
Categories.getChildren(cids, uid, next);
},
- parents: function(next) {
+ parents: function (next) {
Categories.getParents(cids, next);
},
- hasRead: function(next) {
+ hasRead: function (next) {
Categories.hasReadCategories(cids, uid, next);
}
- }, function(err, results) {
+ }, function (err, results) {
if (err) {
return callback(err);
}
@@ -161,7 +161,7 @@ var privileges = require('./privileges');
var categories = results.categories;
var hasRead = results.hasRead;
uid = parseInt(uid, 10);
- for(var i=0; i
+
+
+
+ 
+
+ {../flagData.assigneeUser.icon:text}
+
+
+
[[topic:flag_manage_state_{../flagData.state}open]]
[[topic:flag_manage_title, {posts.category.name}]]
@@ -85,7 +94,7 @@
-
+
@@ -98,7 +107,7 @@
Posted in {posts.category.name}, •
- Read More
+ Read More
{../flagData.assigneeUser.icon:text}
+
+