mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge b82d7d3f47 into 2fce8aeb3e
This commit is contained in:
Matt Friedman
GitHub
commit
33c3dd509d
14 changed files with 4817 additions and 4261 deletions
4
.github/check-js.sh
vendored
4
.github/check-js.sh
vendored
|
|
@ -14,6 +14,6 @@ set +x
|
|||
sudo npm install -g > /dev/null
|
||||
npm ci > /dev/null
|
||||
set -x
|
||||
node_modules/eslint/bin/eslint.js "phpBB/**/*.js"
|
||||
node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig"
|
||||
node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/"
|
||||
node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/"
|
||||
node_modules/eslint/bin/eslint.js "gulpfile.js"
|
||||
|
|
|
|||
67
eslint.config.mjs
Normal file
67
eslint.config.mjs
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
const { browser: browserGlobals, node: nodeGlobals, jquery: jqueryGlobals } = (await import('globals')).default;
|
||||
|
||||
// File patterns to ignore
|
||||
const IGNORED_FILES = [
|
||||
'phpBB/assets/javascript/cropper.js',
|
||||
'phpBB/assets/javascript/hermite.js',
|
||||
'phpBB/assets/javascript/jquery-cropper.js',
|
||||
'phpBB/**/*.min.js',
|
||||
'phpBB/vendor/**/*.js',
|
||||
'phpBB/vendor-ext/**/*.js',
|
||||
'phpBB/phpbb/**/*.js',
|
||||
'phpBB/tests/**/*.js',
|
||||
];
|
||||
|
||||
// ESLint rule configurations
|
||||
const FORMATTING_RULES = {
|
||||
'quotes': ['error', 'single'],
|
||||
'comma-dangle': ['error', 'always-multiline'],
|
||||
'block-spacing': 'error',
|
||||
'array-bracket-spacing': ['error', 'always'],
|
||||
'object-curly-spacing': ['error', 'always'],
|
||||
'space-before-function-paren': ['error', 'never'],
|
||||
'space-in-parens': 'off',
|
||||
};
|
||||
|
||||
const CODE_QUALITY_RULES = {
|
||||
'semi': ['error', 'always'],
|
||||
'eqeqeq': ['error', 'always'],
|
||||
'curly': ['error', 'multi-line'],
|
||||
'no-var': 'error',
|
||||
'prefer-const': 'error',
|
||||
'no-console': 'off',
|
||||
'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
|
||||
};
|
||||
|
||||
const DISABLED_STYLE_RULES = {
|
||||
'multiline-comment-style': 'off',
|
||||
'computed-property-spacing': 'off',
|
||||
'capitalized-comments': 'off',
|
||||
'no-lonely-if': 'off',
|
||||
};
|
||||
|
||||
const mainConfig = {
|
||||
files: ['**/*.js', '**/*.js.twig'],
|
||||
linterOptions: {
|
||||
reportUnusedDisableDirectives: false,
|
||||
},
|
||||
languageOptions: {
|
||||
ecmaVersion: 'latest',
|
||||
sourceType: 'module',
|
||||
globals: {
|
||||
...browserGlobals,
|
||||
...nodeGlobals,
|
||||
...jqueryGlobals,
|
||||
},
|
||||
},
|
||||
rules: {
|
||||
...FORMATTING_RULES,
|
||||
...CODE_QUALITY_RULES,
|
||||
...DISABLED_STYLE_RULES,
|
||||
},
|
||||
};
|
||||
|
||||
export default [
|
||||
{ ignores: IGNORED_FILES },
|
||||
mainConfig,
|
||||
];
|
||||
1780
package-lock.json
generated
1780
package-lock.json
generated
File diff suppressed because it is too large
Load diff
63
package.json
63
package.json
|
|
@ -6,65 +6,6 @@
|
|||
"directories": {
|
||||
"doc": "docs"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "xo",
|
||||
"ignorePatterns": [
|
||||
"phpBB/adm/style/admin.js",
|
||||
"phpBB/adm/style/ajax.js",
|
||||
"phpBB/adm/style/permissions.js",
|
||||
"phpBB/adm/style/tooltip.js",
|
||||
"phpBB/assets/javascript/core.js",
|
||||
"phpBB/assets/javascript/cropper.js",
|
||||
"phpBB/assets/javascript/editor.js",
|
||||
"phpBB/assets/javascript/hermite.js",
|
||||
"phpBB/assets/javascript/installer.js",
|
||||
"phpBB/assets/javascript/jquery-cropper.js",
|
||||
"phpBB/assets/javascript/plupload.js",
|
||||
"phpBB/ext/**/*.js",
|
||||
"phpBB/styles/prosilver/template/ajax.js",
|
||||
"phpBB/styles/prosilver/template/forum_fn.js",
|
||||
"phpBB/**/*.min.js",
|
||||
"phpBB/vendor/**/*.js",
|
||||
"phpBB/vendor-ext/**/*.js",
|
||||
"phpBB/phpbb/**/*.js",
|
||||
"phpBB/tests/**/*.js"
|
||||
],
|
||||
"rules": {
|
||||
"quotes": [
|
||||
"error",
|
||||
"single"
|
||||
],
|
||||
"comma-dangle": [
|
||||
"error",
|
||||
"always-multiline"
|
||||
],
|
||||
"block-spacing": "error",
|
||||
"array-bracket-spacing": [
|
||||
"error",
|
||||
"always"
|
||||
],
|
||||
"multiline-comment-style": "off",
|
||||
"computed-property-spacing": "off",
|
||||
"space-before-function-paren": [
|
||||
"error",
|
||||
"never"
|
||||
],
|
||||
"space-in-parens": "off",
|
||||
"capitalized-comments": "off",
|
||||
"object-curly-spacing": [
|
||||
"error",
|
||||
"always"
|
||||
],
|
||||
"no-lonely-if": "off",
|
||||
"unicorn/prefer-module": "off"
|
||||
},
|
||||
"env": {
|
||||
"es6": true,
|
||||
"browser": true,
|
||||
"node": true,
|
||||
"jquery": true
|
||||
}
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"not ie 11",
|
||||
|
|
@ -101,8 +42,8 @@
|
|||
"devDependencies": {
|
||||
"autoprefixer": "^10.4.4",
|
||||
"cssnano": "^5.1.7",
|
||||
"eslint": "^8.13.0",
|
||||
"eslint-config-xo": "^0.40.0",
|
||||
"eslint": "^9.28.0",
|
||||
"globals": "^16.2.0",
|
||||
"gulp": "^5.0.0",
|
||||
"gulp-concat": "^2.6.1",
|
||||
"gulp-postcss": "^9.0.1",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/* global phpbb */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
/**
|
||||
* phpBB ACP functions
|
||||
|
|
@ -7,19 +8,16 @@
|
|||
/**
|
||||
* Parse document block
|
||||
*/
|
||||
function parse_document(container)
|
||||
{
|
||||
var test = document.createElement('div'),
|
||||
oldBrowser = (typeof test.style.borderRadius == 'undefined');
|
||||
|
||||
function parseDocument(container) {
|
||||
var test = document.createElement('div');
|
||||
test.remove();
|
||||
|
||||
/**
|
||||
* Navigation
|
||||
*/
|
||||
container.find('#menu').each(function() {
|
||||
var menu = $(this),
|
||||
blocks = menu.children('.menu-block');
|
||||
var menu = $(this);
|
||||
var blocks = menu.children('.menu-block');
|
||||
|
||||
if (!blocks.length) {
|
||||
return;
|
||||
|
|
@ -31,6 +29,7 @@ function parse_document(container)
|
|||
if (!parent.hasClass('active')) {
|
||||
parent.siblings().removeClass('active');
|
||||
}
|
||||
|
||||
parent.toggleClass('active');
|
||||
});
|
||||
|
||||
|
|
@ -47,12 +46,11 @@ function parse_document(container)
|
|||
* Responsive tables
|
||||
*/
|
||||
container.find('table').not('.not-responsive').each(function() {
|
||||
var $this = $(this),
|
||||
th = $this.find('thead > tr > th'),
|
||||
columns = th.length,
|
||||
headers = [],
|
||||
totalHeaders = 0,
|
||||
i, headersLength;
|
||||
var $this = $(this);
|
||||
var th = $this.find('thead > tr > th');
|
||||
var headers = [];
|
||||
var totalHeaders = 0;
|
||||
var i;
|
||||
|
||||
// Find columns
|
||||
$this.find('colgroup:first').children().each(function(i) {
|
||||
|
|
@ -71,20 +69,23 @@ function parse_document(container)
|
|||
}
|
||||
|
||||
// Find each header
|
||||
if (!$this.data('no-responsive-header'))
|
||||
{
|
||||
if (!$this.data('no-responsive-header')) {
|
||||
th.each(function(column) {
|
||||
var cell = $(this),
|
||||
colspan = parseInt(cell.attr('colspan')),
|
||||
dfn = cell.attr('data-dfn'),
|
||||
text = dfn ? dfn : $.trim(cell.text());
|
||||
var cell = $(this);
|
||||
var colspan = parseInt(cell.attr('colspan'), 10);
|
||||
var dfn = cell.attr('data-dfn');
|
||||
var text = dfn ? dfn : $.trim(cell.text());
|
||||
|
||||
if (text === ' ') {
|
||||
text = '';
|
||||
}
|
||||
|
||||
if (text == ' ') text = '';
|
||||
colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
|
||||
|
||||
for (i = 0; i < colspan; i++) {
|
||||
headers.push(text);
|
||||
}
|
||||
|
||||
totalHeaders++;
|
||||
|
||||
if (dfn && !column) {
|
||||
|
|
@ -104,19 +105,19 @@ function parse_document(container)
|
|||
}
|
||||
|
||||
$this.find('tbody > tr').each(function() {
|
||||
var row = $(this),
|
||||
cells = row.children('td'),
|
||||
column = 0;
|
||||
var row = $(this);
|
||||
var cells = row.children('td');
|
||||
var column = 0;
|
||||
|
||||
if (cells.length == 1) {
|
||||
if (cells.length === 1) {
|
||||
row.addClass('big-column');
|
||||
return;
|
||||
}
|
||||
|
||||
cells.each(function() {
|
||||
var cell = $(this),
|
||||
colspan = parseInt(cell.attr('colspan')),
|
||||
text = $.trim(cell.text());
|
||||
var cell = $(this);
|
||||
var colspan = parseInt(cell.attr('colspan'), 10);
|
||||
var text = $.trim(cell.text());
|
||||
|
||||
if (headersLength <= column) {
|
||||
return;
|
||||
|
|
@ -124,10 +125,9 @@ function parse_document(container)
|
|||
|
||||
if ((text.length && text !== '-') || cell.children().length) {
|
||||
if (headers[column].length) {
|
||||
cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
|
||||
cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
cell.addClass('empty');
|
||||
}
|
||||
|
||||
|
|
@ -145,8 +145,7 @@ function parse_document(container)
|
|||
*/
|
||||
container.find('table.responsive > tbody').each(function() {
|
||||
var items = $(this).children('tr');
|
||||
if (!items.length)
|
||||
{
|
||||
if (!items.length) {
|
||||
$(this).parent('table:first').addClass('responsive-hide');
|
||||
}
|
||||
});
|
||||
|
|
@ -156,7 +155,7 @@ function parse_document(container)
|
|||
*/
|
||||
container.find('fieldset dt > span:last-child').each(function() {
|
||||
var $this = $(this);
|
||||
if ($this.html() == ' ') {
|
||||
if ($this.html() === ' ') {
|
||||
$this.addClass('responsive-hide');
|
||||
}
|
||||
});
|
||||
|
|
@ -180,25 +179,25 @@ function parse_document(container)
|
|||
* Responsive tabs
|
||||
*/
|
||||
container.find('#tabs').not('[data-skip-responsive]').each(function() {
|
||||
var $this = $(this),
|
||||
$body = $('body'),
|
||||
ul = $this.children(),
|
||||
tabs = ul.children().not('[data-skip-responsive]'),
|
||||
links = tabs.children('a'),
|
||||
item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
|
||||
menu = item.find('.dropdown-contents'),
|
||||
maxHeight = 0,
|
||||
lastWidth = false,
|
||||
responsive = false;
|
||||
var $this = $(this);
|
||||
var $body = $('body');
|
||||
var ul = $this.children();
|
||||
var tabs = ul.children().not('[data-skip-responsive]');
|
||||
var links = tabs.children('a');
|
||||
var item = ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab');
|
||||
var menu = item.find('.dropdown-contents');
|
||||
var maxHeight = 0;
|
||||
var lastWidth = false;
|
||||
var responsive = false;
|
||||
|
||||
links.each(function() {
|
||||
var link = $(this);
|
||||
maxHeight = Math.max(maxHeight, Math.max(link.outerHeight(true), link.parent().outerHeight(true)));
|
||||
})
|
||||
});
|
||||
|
||||
function check() {
|
||||
var width = $body.width(),
|
||||
height = $this.height();
|
||||
var width = $body.width();
|
||||
var height = $this.height();
|
||||
|
||||
if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
|
||||
return;
|
||||
|
|
@ -214,6 +213,7 @@ function parse_document(container)
|
|||
if (item.hasClass('dropdown-visible')) {
|
||||
phpbb.toggleDropdown.call(item.find('a.responsive-tab-link').get(0));
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -221,20 +221,26 @@ function parse_document(container)
|
|||
item.show();
|
||||
menu.html('');
|
||||
|
||||
var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)'),
|
||||
total = availableTabs.length,
|
||||
i, tab;
|
||||
var availableTabs = tabs.filter(':not(.activetab, .responsive-tab)');
|
||||
var total = availableTabs.length;
|
||||
var i;
|
||||
var tab;
|
||||
|
||||
for (i = total - 1; i >= 0; i--) {
|
||||
tab = availableTabs.eq(i);
|
||||
menu.prepend(tab.clone(true).removeClass('tab'));
|
||||
tab.hide();
|
||||
if ($this.height() <= maxHeight) {
|
||||
menu.find('a').click(function() { check(true); });
|
||||
menu.find('a').click(() => {
|
||||
check(true);
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
menu.find('a').click(function() { check(true); });
|
||||
|
||||
menu.find('a').click(() => {
|
||||
check(true);
|
||||
});
|
||||
}
|
||||
|
||||
phpbb.registerDropdown(item.find('a.responsive-tab-link'), item.find('.dropdown'), { visibleClass: 'activetab', verticalDirection: 'down' });
|
||||
|
|
@ -248,7 +254,7 @@ function parse_document(container)
|
|||
* Run onload functions
|
||||
*/
|
||||
(function($) {
|
||||
$(document).ready(function() {
|
||||
$(document).ready(() => {
|
||||
// Swap .nojs and .hasjs
|
||||
$('body.nojs').toggleClass('nojs hasjs');
|
||||
|
||||
|
|
@ -257,7 +263,7 @@ function parse_document(container)
|
|||
$('#' + this.getAttribute('data-focus')).focus();
|
||||
});
|
||||
|
||||
parse_document($('body'));
|
||||
parseDocument($('body'));
|
||||
|
||||
$('#questionnaire-form').css('display', 'none');
|
||||
var $triggerConfiglist = $('#trigger-configlist');
|
||||
|
|
@ -273,7 +279,7 @@ function parse_document(container)
|
|||
|
||||
// Do not underline actions icons on hover (could not be done via CSS)
|
||||
$('.actions a:has(i.acp-icon)').mouseover(function() {
|
||||
$(this).css("text-decoration", "none");
|
||||
$(this).css('text-decoration', 'none');
|
||||
});
|
||||
|
||||
// Live update BBCode font icon preview
|
||||
|
|
|
|||
|
|
@ -1,29 +1,27 @@
|
|||
/* global phpbb, statsData */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
'use strict';
|
||||
|
||||
|
||||
phpbb.prepareSendStats = function() {
|
||||
var $form = $('#acp_help_phpbb');
|
||||
var $dark = $('#darkenwrapper');
|
||||
var $loadingIndicator;
|
||||
|
||||
$form.on('submit', function(event) {
|
||||
var $this = $(this),
|
||||
currentTime = Math.floor(new Date().getTime() / 1000),
|
||||
statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
|
||||
var $this = $(this);
|
||||
var currentTime = Math.floor(new Date().getTime() / 1000);
|
||||
var statsTime = parseInt($this.find('input[name=help_send_statistics_time]').val(), 10);
|
||||
|
||||
event.preventDefault();
|
||||
$this.unbind('submit');
|
||||
|
||||
// Skip ajax request if form is submitted too early or send stats
|
||||
// checkbox is not checked
|
||||
if (!$this.find('input[name=help_send_statistics]').is(':checked') ||
|
||||
statsTime > currentTime) {
|
||||
if (!$this.find('input[name=help_send_statistics]').is(':checked') || statsTime > currentTime) {
|
||||
$form.find('input[type=submit]').click();
|
||||
setTimeout(function () {
|
||||
setTimeout(() => {
|
||||
$form.find('input[type=submit]').click();
|
||||
}, 300);
|
||||
return;
|
||||
|
|
@ -36,6 +34,7 @@ phpbb.prepareSendStats = function () {
|
|||
if (typeof console !== 'undefined' && console.log) {
|
||||
console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
|
||||
}
|
||||
|
||||
phpbb.clearLoadingTimeout();
|
||||
var errorText = '';
|
||||
|
||||
|
|
@ -47,6 +46,7 @@ phpbb.prepareSendStats = function () {
|
|||
errorText = $dark.attr('data-ajax-error-text');
|
||||
}
|
||||
}
|
||||
|
||||
phpbb.alert($dark.attr('data-ajax-error-title'), errorText);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ phpbb.prepareSendStats = function () {
|
|||
var $sendStatisticsSuccess = $('<input />', {
|
||||
type: 'hidden',
|
||||
name: 'send_statistics_response',
|
||||
value: JSON.stringify(res)
|
||||
value: JSON.stringify(res),
|
||||
});
|
||||
$sendStatisticsSuccess.appendTo('p.submit-buttons');
|
||||
|
||||
|
|
@ -90,8 +90,8 @@ phpbb.prepareSendStats = function () {
|
|||
data: statsData,
|
||||
success: returnHandler,
|
||||
error: errorHandler,
|
||||
cache: false
|
||||
}).always(function() {
|
||||
cache: false,
|
||||
}).always(() => {
|
||||
if ($loadingIndicator && $loadingIndicator.is(':visible')) {
|
||||
$loadingIndicator.fadeOut(phpbb.alertTime);
|
||||
}
|
||||
|
|
@ -110,8 +110,8 @@ phpbb.addAjaxCallback('row_down', function(res) {
|
|||
return;
|
||||
}
|
||||
|
||||
var $firstTr = $(this).parents('tr'),
|
||||
$secondTr = $firstTr.next();
|
||||
var $firstTr = $(this).parents('tr');
|
||||
var $secondTr = $firstTr.next();
|
||||
|
||||
$firstTr.insertAfter($secondTr);
|
||||
});
|
||||
|
|
@ -121,8 +121,8 @@ phpbb.addAjaxCallback('row_up', function(res) {
|
|||
return;
|
||||
}
|
||||
|
||||
var $secondTr = $(this).parents('tr'),
|
||||
$firstTr = $secondTr.prev();
|
||||
var $secondTr = $(this).parents('tr');
|
||||
var $firstTr = $secondTr.prev();
|
||||
|
||||
$secondTr.insertBefore($firstTr);
|
||||
});
|
||||
|
|
@ -133,15 +133,15 @@ phpbb.addAjaxCallback('row_up', function(res) {
|
|||
* in the href with "deactivate", and vice versa.
|
||||
*/
|
||||
phpbb.addAjaxCallback('activate_deactivate', function(res) {
|
||||
var $this = $(this),
|
||||
newHref = $this.attr('href');
|
||||
var $this = $(this);
|
||||
var newHref = $this.attr('href');
|
||||
|
||||
$this.text(res.text);
|
||||
|
||||
if (newHref.indexOf('deactivate') !== -1) {
|
||||
newHref = newHref.replace('deactivate', 'activate');
|
||||
} else {
|
||||
if (newHref.indexOf('deactivate') === -1) {
|
||||
newHref = newHref.replace('activate', 'deactivate');
|
||||
} else {
|
||||
newHref = newHref.replace('deactivate', 'activate');
|
||||
}
|
||||
|
||||
$this.attr('href', newHref);
|
||||
|
|
@ -161,7 +161,6 @@ phpbb.addAjaxCallback('row_delete', function(res) {
|
|||
* This callback generates the VAPID keys for the web push notification service.
|
||||
*/
|
||||
phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
||||
|
||||
/**
|
||||
* Generate VAPID keypair with public and private key string
|
||||
*
|
||||
|
|
@ -176,7 +175,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
|||
namedCurve: 'P-256',
|
||||
},
|
||||
true,
|
||||
['deriveKey', 'deriveBits']
|
||||
[ 'deriveKey', 'deriveBits' ],
|
||||
);
|
||||
|
||||
const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey);
|
||||
|
|
@ -187,7 +186,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
|||
|
||||
return {
|
||||
privateKey: privateKeyString,
|
||||
publicKey: publicKeyString
|
||||
publicKey: publicKeyString,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Error generating keys with SubtleCrypto:', error);
|
||||
|
|
@ -199,38 +198,38 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
|||
if (!keyPair) {
|
||||
return;
|
||||
}
|
||||
|
||||
const publicKeyInput = document.querySelector('#webpush_vapid_public');
|
||||
const privateKeyInput = document.querySelector('#webpush_vapid_private');
|
||||
publicKeyInput.value = keyPair.publicKey;
|
||||
privateKeyInput.value = keyPair.privateKey;
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Handler for submitting permissions form in chunks
|
||||
* This call will submit permissions forms in chunks of 5 fieldsets.
|
||||
*/
|
||||
function submitPermissions() {
|
||||
var $form = $('form#set-permissions'),
|
||||
fieldsetList = $form.find('fieldset[id^=perm]'),
|
||||
formDataSets = [],
|
||||
dataSetIndex = 0,
|
||||
$submitAllButton = $form.find('input[type=submit][name^=action]')[0],
|
||||
$submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
|
||||
var $form = $('form#set-permissions');
|
||||
var fieldsetList = $form.find('fieldset[id^=perm]');
|
||||
var formDataSets = [];
|
||||
var dataSetIndex = 0;
|
||||
var $submitAllButton = $form.find('input[type=submit][name^=action]')[0];
|
||||
var $submitButton = $form.find('input[type=submit][data-clicked=true]')[0];
|
||||
|
||||
// Set proper start values for handling refresh of page
|
||||
var permissionSubmitSize = 0,
|
||||
permissionRequestCount = 0,
|
||||
forumIds = [],
|
||||
permissionSubmitFailed = false,
|
||||
clearIndicator = true,
|
||||
$loadingIndicator;
|
||||
var permissionSubmitSize = 0;
|
||||
var permissionRequestCount = 0;
|
||||
var forumIds = [];
|
||||
var permissionSubmitFailed = false;
|
||||
var clearIndicator = true;
|
||||
|
||||
if ($submitAllButton !== $submitButton) {
|
||||
fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
|
||||
}
|
||||
|
||||
$.each(fieldsetList, function (key, value) {
|
||||
$.each(fieldsetList, (key, value) => {
|
||||
dataSetIndex = Math.floor(key / 5);
|
||||
var $fieldset = $('fieldset#' + value.id);
|
||||
if (key % 5 === 0) {
|
||||
|
|
@ -244,21 +243,21 @@ function submitPermissions() {
|
|||
if (roleInput.val()) {
|
||||
formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' + roleInput.val();
|
||||
} else {
|
||||
formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '=' +
|
||||
$fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
|
||||
formDataSets[dataSetIndex] += '&' + roleInput.attr('name') + '='
|
||||
+ $fieldset.find('select[name="' + roleInput.attr('name') + '"]').val();
|
||||
}
|
||||
});
|
||||
|
||||
permissionSubmitSize = formDataSets.length;
|
||||
|
||||
// Add each forum ID to forum ID list to preserve selected forums
|
||||
$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
|
||||
$.each($form.find('input[type=hidden][name^=forum_id]'), (key, value) => {
|
||||
if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
|
||||
forumIds.push(value.value);
|
||||
}
|
||||
});
|
||||
|
||||
$loadingIndicator = phpbb.loadingIndicator();
|
||||
var $loadingIndicator = phpbb.loadingIndicator();
|
||||
|
||||
/**
|
||||
* Handler for submitted permissions form chunk
|
||||
|
|
@ -286,18 +285,18 @@ function submitPermissions() {
|
|||
$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, ''));
|
||||
const $previousPageForm = $('<form>').attr({
|
||||
action: $alertBoxLink.attr('href'),
|
||||
method: 'post'
|
||||
method: 'post',
|
||||
});
|
||||
|
||||
$.each(forumIds, function (key, value) {
|
||||
$.each(forumIds, (key, value) => {
|
||||
$previousPageForm.append($('<input>').attr({
|
||||
type: 'text',
|
||||
name: 'forum_id[]',
|
||||
value: value
|
||||
value,
|
||||
}));
|
||||
});
|
||||
|
||||
$alertBoxLink.on('click', function (e) {
|
||||
$alertBoxLink.on('click', e => {
|
||||
$('body').append($previousPageForm);
|
||||
e.preventDefault();
|
||||
$previousPageForm.submit();
|
||||
|
|
@ -309,19 +308,19 @@ function submitPermissions() {
|
|||
$alert.find('.alert_close').hide();
|
||||
|
||||
if (typeof res.REFRESH_DATA !== 'undefined') {
|
||||
setTimeout(function () {
|
||||
setTimeout(() => {
|
||||
// Create forum to submit using POST. This will prevent
|
||||
// exceeding the maximum length of URLs
|
||||
const $form = $('<form>').attr({
|
||||
action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''),
|
||||
method: 'post'
|
||||
method: 'post',
|
||||
});
|
||||
|
||||
$.each(forumIds, function (key, value) {
|
||||
$.each(forumIds, (key, value) => {
|
||||
$form.append($('<input>').attr({
|
||||
type: 'text',
|
||||
name: 'forum_id[]',
|
||||
value: value
|
||||
value,
|
||||
}));
|
||||
});
|
||||
|
||||
|
|
@ -329,7 +328,7 @@ function submitPermissions() {
|
|||
|
||||
// Hide the alert even if we refresh the page, in case the user
|
||||
// presses the back button.
|
||||
$dark.fadeOut(phpbb.alertTime, function () {
|
||||
$dark.fadeOut(phpbb.alertTime, () => {
|
||||
if (typeof $alert !== 'undefined') {
|
||||
$alert.hide();
|
||||
}
|
||||
|
|
@ -355,31 +354,31 @@ function submitPermissions() {
|
|||
}
|
||||
|
||||
// Create AJAX request for each form data set
|
||||
$.each(formDataSets, function (key, formData) {
|
||||
$.each(formDataSets, (key, formData) => {
|
||||
$.ajax({
|
||||
url: $form.action,
|
||||
type: 'POST',
|
||||
data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value) +
|
||||
'&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value +
|
||||
'&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value +
|
||||
'&' + $form.children('input[type=hidden]').serialize() +
|
||||
'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
|
||||
data: formData + '&' + $submitButton.name + '=' + encodeURIComponent($submitButton.value)
|
||||
+ '&creation_time=' + $form.find('input[type=hidden][name=creation_time]')[0].value
|
||||
+ '&form_token=' + $form.find('input[type=hidden][name=form_token]')[0].value
|
||||
+ '&' + $form.children('input[type=hidden]').serialize()
|
||||
+ '&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
|
||||
success: handlePermissionReturn,
|
||||
error: handlePermissionReturn
|
||||
error: handlePermissionReturn,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
$('[data-ajax]').each(function() {
|
||||
var $this = $(this),
|
||||
ajax = $this.attr('data-ajax');
|
||||
var $this = $(this);
|
||||
var ajax = $this.attr('data-ajax');
|
||||
|
||||
if (ajax !== 'false') {
|
||||
var fn = (ajax !== 'true') ? ajax : null;
|
||||
var fn = (ajax === 'true') ? null : ajax;
|
||||
phpbb.ajaxify({
|
||||
selector: this,
|
||||
refresh: $this.attr('data-refresh') !== undefined,
|
||||
callback: fn
|
||||
callback: fn,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -387,12 +386,12 @@ $('[data-ajax]').each(function() {
|
|||
/**
|
||||
* Automatically resize textarea
|
||||
*/
|
||||
$(function() {
|
||||
$(() => {
|
||||
phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), { minHeight: 75 });
|
||||
|
||||
var $setPermissionsForm = $('form#set-permissions');
|
||||
if ($setPermissionsForm.length) {
|
||||
$setPermissionsForm.on('submit', function (e) {
|
||||
$setPermissionsForm.on('submit', e => {
|
||||
submitPermissions();
|
||||
e.preventDefault();
|
||||
});
|
||||
|
|
@ -412,13 +411,11 @@ $(function() {
|
|||
} else {
|
||||
dateoptionInput.value = this.value;
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
if ($('#acp_help_phpbb')) {
|
||||
phpbb.prepareSendStats();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-undef: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
/**
|
||||
* Hide and show all checkboxes
|
||||
|
|
@ -9,12 +13,11 @@ function display_checkboxes(status) {
|
|||
var cb = document.getElementsByTagName('input');
|
||||
var display;
|
||||
|
||||
//show
|
||||
if (status) {
|
||||
// show
|
||||
display = 'inline';
|
||||
}
|
||||
} else {
|
||||
// hide
|
||||
else {
|
||||
display = 'none';
|
||||
}
|
||||
|
||||
|
|
@ -86,12 +89,13 @@ function reset_opacity(status, except_id) {
|
|||
* rb = array of radiobuttons
|
||||
*/
|
||||
function get_radio_status(index, rb) {
|
||||
for (var i = index; i < rb.length; i = i + 3 ) {
|
||||
for (var i = index; i < rb.length; i += 3 ) {
|
||||
if (rb[i].checked !== true) {
|
||||
if (i > index) {
|
||||
// at least one is true, but not all (custom)
|
||||
return 2;
|
||||
}
|
||||
|
||||
// first one is not true
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -161,7 +165,7 @@ function init_colours(block_id) {
|
|||
}
|
||||
}
|
||||
|
||||
tab.className = tab.className + ' activetab';
|
||||
tab.className += ' activetab';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -170,6 +174,7 @@ function init_colours(block_id) {
|
|||
* adv = we are opening advanced permissions
|
||||
* view = called from view permissions
|
||||
*/
|
||||
// eslint-disable-next-line max-params
|
||||
function swap_options(pmask, fmask, cat, adv, view) {
|
||||
id = pmask + fmask + cat;
|
||||
active_option = active_pmask + active_fmask + active_cat;
|
||||
|
|
@ -202,8 +207,8 @@ function swap_options(pmask, fmask, cat, adv, view) {
|
|||
}
|
||||
|
||||
// set active tab
|
||||
old_tab.className = old_tab.className.replace(/\ activetab/g, '');
|
||||
new_tab.className = new_tab.className + ' activetab';
|
||||
old_tab.className = old_tab.className.replace(/ activetab/g, '');
|
||||
new_tab.className += ' activetab';
|
||||
|
||||
if (id === active_option && adv !== true) {
|
||||
return;
|
||||
|
|
@ -227,6 +232,7 @@ function swap_options(pmask, fmask, cat, adv, view) {
|
|||
if (!view) {
|
||||
phpbb.toggleDisplay('advanced' + pmask + fmask, 1);
|
||||
}
|
||||
|
||||
phpbb.toggleDisplay('options' + id, 1);
|
||||
|
||||
active_pmask = pmask;
|
||||
|
|
@ -287,10 +293,10 @@ function reset_role(id) {
|
|||
}
|
||||
|
||||
// Before resetting the role dropdown, try and match any permission role
|
||||
var parent = t.parentNode,
|
||||
roleId = match_role_settings(id.replace('role', 'perm')),
|
||||
text = no_role_assigned,
|
||||
index = 0;
|
||||
var parent = t.parentNode;
|
||||
var roleId = match_role_settings(id.replace('role', 'perm'));
|
||||
var text = no_role_assigned;
|
||||
var index = 0;
|
||||
|
||||
// If a role permissions was matched, grab that option's value and index
|
||||
if (roleId) {
|
||||
|
|
@ -326,9 +332,11 @@ function set_role_settings(role_id, target_id) {
|
|||
mark_options(target_id, 'u');
|
||||
|
||||
for (var r in settings) {
|
||||
if (Object.prototype.hasOwnProperty.call(settings, r)) {
|
||||
mark_one_option(target_id, r, (settings[r] === 1) ? 'y' : 'n');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Match the set permissions against the available roles.
|
||||
|
|
@ -337,9 +345,9 @@ function set_role_settings(role_id, target_id) {
|
|||
* @return {number} The permission role identifier
|
||||
*/
|
||||
function match_role_settings(id) {
|
||||
var fieldset = document.getElementById(id),
|
||||
radios = fieldset.getElementsByTagName('input'),
|
||||
set = {};
|
||||
var fieldset = document.getElementById(id);
|
||||
var radios = fieldset.getElementsByTagName('input');
|
||||
var set = {};
|
||||
|
||||
// Iterate over all the radio buttons
|
||||
for (var i = 0; i < radios.length; i++) {
|
||||
|
|
@ -355,8 +363,7 @@ function match_role_settings(id) {
|
|||
set = sort_and_stringify(set);
|
||||
|
||||
// Iterate over the available role options and return the first match
|
||||
for (var r in role_options)
|
||||
{
|
||||
for (var r in role_options) {
|
||||
if (sort_and_stringify(role_options[r]) === set) {
|
||||
return parseInt(r, 10);
|
||||
}
|
||||
|
|
@ -372,7 +379,7 @@ function match_role_settings(id) {
|
|||
* @return {string} The sorted object as a string
|
||||
*/
|
||||
function sort_and_stringify(obj) {
|
||||
return JSON.stringify(Object.keys(obj).sort().reduce(function (result, key) {
|
||||
return JSON.stringify(Object.keys(obj).sort().reduce((result, key) => {
|
||||
result[key] = obj[key];
|
||||
return result;
|
||||
}, {}));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/* global phpbb */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
/*
|
||||
javascript for Bubble Tooltips by Alessandro Fulciniti
|
||||
|
|
@ -13,7 +14,6 @@ phpBB Development Team:
|
|||
*/
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
'use strict';
|
||||
|
||||
var tooltips = [];
|
||||
|
|
@ -25,21 +25,21 @@ var tooltips = [];
|
|||
* @param {string} [subId] Sub ID that should only be using tooltips (optional)
|
||||
*/
|
||||
phpbb.enableTooltipsSelect = function(id, headline, subId) {
|
||||
var $links, hold;
|
||||
var $links;
|
||||
|
||||
hold = $('<span />', {
|
||||
var hold = $('<span />', {
|
||||
id: '_tooltip_container',
|
||||
css: {
|
||||
position: 'absolute'
|
||||
}
|
||||
position: 'absolute',
|
||||
},
|
||||
});
|
||||
|
||||
$('body').append(hold);
|
||||
|
||||
if (!id) {
|
||||
$links = $('.roles-options li');
|
||||
} else {
|
||||
if (id) {
|
||||
$links = $('.roles-options li', '#' + id);
|
||||
} else {
|
||||
$links = $('.roles-options li');
|
||||
}
|
||||
|
||||
$links.each(function() {
|
||||
|
|
@ -62,35 +62,33 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
|
|||
* @param {string} headText Text heading to display
|
||||
*/
|
||||
phpbb.prepareTooltips = function($element, headText) {
|
||||
var $tooltip, text, $desc, $title;
|
||||
|
||||
text = $element.attr('data-title');
|
||||
var text = $element.attr('data-title');
|
||||
|
||||
if (text === null || text.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$title = $('<span />', {
|
||||
var $title = $('<span />', {
|
||||
class: 'top',
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
})
|
||||
.append(document.createTextNode(headText));
|
||||
|
||||
$desc = $('<span />', {
|
||||
var $desc = $('<span />', {
|
||||
class: 'bottom',
|
||||
html: text,
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
});
|
||||
|
||||
$tooltip = $('<span />', {
|
||||
var $tooltip = $('<span />', {
|
||||
class: 'tooltip',
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
})
|
||||
.append($title)
|
||||
.append($desc);
|
||||
|
|
@ -127,20 +125,18 @@ phpbb.hideTooltip = function () {
|
|||
* @param {jQuery} $element Tooltip element that should be positioned
|
||||
*/
|
||||
phpbb.positionTooltip = function($element) {
|
||||
var offset;
|
||||
|
||||
$element = $element.parent();
|
||||
offset = $element.offset();
|
||||
var offset = $element.offset();
|
||||
|
||||
if ($('body').hasClass('rtl')) {
|
||||
$('#_tooltip_container').css({
|
||||
top: offset.top + 30,
|
||||
left: offset.left + 255
|
||||
left: offset.left + 255,
|
||||
});
|
||||
} else {
|
||||
$('#_tooltip_container').css({
|
||||
top: offset.top + 30,
|
||||
left: offset.left - 205
|
||||
left: offset.left - 205,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
@ -182,7 +178,7 @@ phpbb.prepareRolesDropdown = function () {
|
|||
}
|
||||
|
||||
// Prepare resetting drop down on form reset
|
||||
$this.closest('form').on('reset', function () {
|
||||
$this.closest('form').on('reset', () => {
|
||||
$span.text($span.attr('data-default'));
|
||||
$rolesOptions.children('input[type=hidden]')
|
||||
.val($span.attr('data-default-val'));
|
||||
|
|
@ -198,7 +194,9 @@ phpbb.prepareRolesDropdown = function () {
|
|||
var $rolesOptions = $this.closest('.roles-options');
|
||||
|
||||
// Update settings
|
||||
// eslint-disable-next-line no-undef
|
||||
set_role_settings($this.attr('data-id'), $this.attr('data-target-id'));
|
||||
// eslint-disable-next-line no-undef
|
||||
init_colours($this.attr('data-target-id').replace('advanced', ''));
|
||||
|
||||
// Set selected setting
|
||||
|
|
@ -214,12 +212,11 @@ phpbb.prepareRolesDropdown = function () {
|
|||
};
|
||||
|
||||
// Run onload functions for RolesDropdown and tooltips
|
||||
$(function() {
|
||||
$(() => {
|
||||
// Enable tooltips
|
||||
phpbb.enableTooltipsSelect('set-permissions', $('#set-permissions').attr('data-role-description'), 'role');
|
||||
|
||||
// Prepare dropdown
|
||||
phpbb.prepareRolesDropdown();
|
||||
});
|
||||
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,4 +1,11 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-undef: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
var form_name = 'postform';
|
||||
var text_name = 'message';
|
||||
|
||||
/**
|
||||
* bbCode control by subBlue design [ www.subBlue.com ]
|
||||
|
|
@ -48,11 +55,11 @@ function initInsertions() {
|
|||
* bbstyle
|
||||
*/
|
||||
function bbstyle(bbnumber) {
|
||||
if (bbnumber !== -1) {
|
||||
bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
|
||||
} else {
|
||||
if (bbnumber === -1) {
|
||||
insert_text('[*]');
|
||||
document.forms[form_name].elements[text_name].focus();
|
||||
} else {
|
||||
bbfontstyle(bbtags[bbnumber], bbtags[bbnumber + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -96,11 +103,10 @@ function bbfontstyle(bbopen, bbclose) {
|
|||
if (!isNaN(textarea.selectionStart)) {
|
||||
textarea.selectionStart = new_pos;
|
||||
textarea.selectionEnd = new_pos;
|
||||
}
|
||||
} else if (document.selection) {
|
||||
// IE
|
||||
else if (document.selection) {
|
||||
var range = textarea.createTextRange();
|
||||
range.move("character", new_pos);
|
||||
range.move('character', new_pos);
|
||||
range.select();
|
||||
storeCaret(textarea);
|
||||
}
|
||||
|
|
@ -114,10 +120,10 @@ function bbfontstyle(bbopen, bbclose) {
|
|||
function insert_text(text, spaces, popup) {
|
||||
var textarea;
|
||||
|
||||
if (!popup) {
|
||||
textarea = document.forms[form_name].elements[text_name];
|
||||
} else {
|
||||
if (popup) {
|
||||
textarea = opener.document.forms[form_name].elements[text_name];
|
||||
} else {
|
||||
textarea = document.forms[form_name].elements[text_name];
|
||||
}
|
||||
|
||||
if (spaces) {
|
||||
|
|
@ -142,7 +148,7 @@ function insert_text(text, spaces, popup) {
|
|||
var caret_pos = textarea.caretPos;
|
||||
caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) === ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
|
||||
} else {
|
||||
textarea.value = textarea.value + text;
|
||||
textarea.value += text;
|
||||
}
|
||||
|
||||
if (!popup) {
|
||||
|
|
@ -171,6 +177,7 @@ function addquote(post_id, username, l_wrote, attributes) {
|
|||
// Backwards compatibility
|
||||
l_wrote = 'wrote';
|
||||
}
|
||||
|
||||
if (typeof attributes !== 'object') {
|
||||
attributes = {};
|
||||
}
|
||||
|
|
@ -195,10 +202,10 @@ function addquote(post_id, username, l_wrote, attributes) {
|
|||
if (divarea.innerHTML) {
|
||||
theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
|
||||
theSelection = theSelection.replace(/<br\/>/ig, '\n');
|
||||
theSelection = theSelection.replace(/<\;/ig, '<');
|
||||
theSelection = theSelection.replace(/>\;/ig, '>');
|
||||
theSelection = theSelection.replace(/&\;/ig, '&');
|
||||
theSelection = theSelection.replace(/ \;/ig, ' ');
|
||||
theSelection = theSelection.replace(/</ig, '<');
|
||||
theSelection = theSelection.replace(/>/ig, '>');
|
||||
theSelection = theSelection.replace(/&/ig, '&');
|
||||
theSelection = theSelection.replace(/ /ig, ' ');
|
||||
} else if (document.all) {
|
||||
theSelection = divarea.innerText;
|
||||
} else if (divarea.textContent) {
|
||||
|
|
@ -213,7 +220,7 @@ function addquote(post_id, username, l_wrote, attributes) {
|
|||
attributes.author = username;
|
||||
insert_text(generateQuote(theSelection, attributes));
|
||||
} else {
|
||||
insert_text(username + ' ' + l_wrote + ':' + '\n');
|
||||
insert_text(username + ' ' + l_wrote + ':\n');
|
||||
var lines = split_lines(theSelection);
|
||||
for (i = 0; i < lines.length; i++) {
|
||||
insert_text('> ' + lines[i] + '\n');
|
||||
|
|
@ -243,12 +250,14 @@ function generateQuote(text, attributes) {
|
|||
quote += '=' + formatAttributeValue(attributes.author);
|
||||
delete attributes.author;
|
||||
}
|
||||
|
||||
for (var name in attributes) {
|
||||
if (attributes.hasOwnProperty(name)) {
|
||||
if (Object.hasOwn(attributes, name)) {
|
||||
var value = attributes[name];
|
||||
quote += ' ' + name + '=' + formatAttributeValue(value.toString());
|
||||
}
|
||||
}
|
||||
|
||||
quote += ']';
|
||||
var newline = ((quote + text + '[/quote]').length > 80 || text.indexOf('\n') > -1) ? '\n' : '';
|
||||
quote += newline + text + newline + '[/quote]';
|
||||
|
|
@ -271,15 +280,16 @@ function formatAttributeValue(str) {
|
|||
// Return as-is if it contains none of: space, ' " \ or ]
|
||||
return str;
|
||||
}
|
||||
var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
|
||||
doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
|
||||
|
||||
var singleQuoted = '\'' + str.replace(/[\\']/g, '\\$&') + '\'';
|
||||
var doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
|
||||
|
||||
return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;
|
||||
}
|
||||
|
||||
function split_lines(text) {
|
||||
var lines = text.split('\n');
|
||||
var splitLines = new Array();
|
||||
var splitLines = [];
|
||||
var j = 0;
|
||||
var i;
|
||||
|
||||
|
|
@ -305,6 +315,7 @@ function split_lines(text) {
|
|||
while (splitAt !== -1);
|
||||
}
|
||||
}
|
||||
|
||||
return splitLines;
|
||||
}
|
||||
|
||||
|
|
@ -326,8 +337,6 @@ function mozWrap(txtarea, open, close) {
|
|||
txtarea.selectionEnd = selEnd + open.length;
|
||||
txtarea.focus();
|
||||
txtarea.scrollTop = scrollTop;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -358,9 +367,8 @@ function getCaretPosition(txtarea) {
|
|||
if (txtarea.selectionStart || txtarea.selectionStart === 0) {
|
||||
caretPos.start = txtarea.selectionStart;
|
||||
caretPos.end = txtarea.selectionEnd;
|
||||
}
|
||||
} else if (document.selection) {
|
||||
// dirty and slow IE way
|
||||
else if (document.selection) {
|
||||
// get current selection
|
||||
var range = document.selection.createRange();
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
* Installer's AJAX frontend handler
|
||||
*/
|
||||
|
||||
/* eslint no-prototype-builtins: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
'use strict';
|
||||
|
||||
|
|
@ -46,7 +49,10 @@
|
|||
var $warningContainer = $('#warning-container');
|
||||
var $logContainer = $('#log-container');
|
||||
|
||||
var $title, $description, $msgElement, arraySize = messages.length;
|
||||
var $title;
|
||||
var $description;
|
||||
var $msgElement;
|
||||
var arraySize = messages.length;
|
||||
for (var i = 0; i < arraySize; i++) {
|
||||
$msgElement = $('<div />');
|
||||
$title = $('<strong />');
|
||||
|
|
@ -59,24 +65,19 @@
|
|||
$msgElement.append($description);
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case 'error':
|
||||
if (type === 'error') {
|
||||
$msgElement.addClass('errorbox');
|
||||
$errorContainer.append($msgElement);
|
||||
break;
|
||||
case 'warning':
|
||||
} else if (type === 'warning') {
|
||||
$msgElement.addClass('warningbox');
|
||||
$warningContainer.append($msgElement);
|
||||
break;
|
||||
case 'log':
|
||||
} else if (type === 'log') {
|
||||
$msgElement.addClass('log');
|
||||
$logContainer.prepend($msgElement);
|
||||
$logContainer.addClass('show_log_container');
|
||||
break;
|
||||
case 'success':
|
||||
} else if (type === 'success') {
|
||||
$msgElement.addClass('successbox');
|
||||
$errorContainer.prepend($msgElement);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -84,10 +85,12 @@
|
|||
/**
|
||||
* Render a download box
|
||||
*/
|
||||
function addDownloadBox(downloadArray)
|
||||
{
|
||||
function addDownloadBox(downloadArray) {
|
||||
var $downloadContainer = $('#download-wrapper');
|
||||
var $downloadBox, $title, $content, $link;
|
||||
var $downloadBox;
|
||||
var $title;
|
||||
var $content;
|
||||
var $link;
|
||||
|
||||
for (var i = 0; i < downloadArray.length; i++) {
|
||||
$downloadBox = $('<div />');
|
||||
|
|
@ -116,8 +119,7 @@
|
|||
/**
|
||||
* Render update files' status
|
||||
*/
|
||||
function addUpdateFileStatus(fileStatus)
|
||||
{
|
||||
function addUpdateFileStatus(fileStatus) {
|
||||
var $statusContainer = $('#file-status-wrapper');
|
||||
$statusContainer.html(fileStatus);
|
||||
}
|
||||
|
|
@ -140,8 +142,10 @@
|
|||
* @param navObj
|
||||
*/
|
||||
function updateNavbarStatus(navObj) {
|
||||
var navID, $stage, $stageListItem, $active;
|
||||
$active = $('#activemenu');
|
||||
var navID;
|
||||
var $stage;
|
||||
var $stageListItem;
|
||||
var $active = $('#activemenu');
|
||||
|
||||
if (navObj.hasOwnProperty('finished')) {
|
||||
// This should be an Array
|
||||
|
|
@ -179,7 +183,11 @@
|
|||
* @param progressObject
|
||||
*/
|
||||
function setProgress(progressObject) {
|
||||
var $statusText, $progressBar, $progressText, $progressFiller, $progressFillerText;
|
||||
var $statusText;
|
||||
var $progressBar;
|
||||
var $progressText;
|
||||
var $progressFiller;
|
||||
var $progressFillerText;
|
||||
|
||||
if (progressObject.task_name.length) {
|
||||
if (!progressBarTriggered) {
|
||||
|
|
@ -246,8 +254,8 @@
|
|||
}
|
||||
|
||||
// Redirects user
|
||||
function redirect(url, use_ajax) {
|
||||
if (use_ajax) {
|
||||
function redirect(url, useAjax) {
|
||||
if (useAjax) {
|
||||
resetPolling();
|
||||
|
||||
var xhReq = createXhrObject();
|
||||
|
|
@ -276,6 +284,7 @@
|
|||
if (window.console) {
|
||||
console.log('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
|
||||
} else {
|
||||
// eslint-disable-next-line no-alert
|
||||
alert('Failed to parse JSON object\n\nMessage: ' + err.message + '\n\nServer Response: ' + messageJSON);
|
||||
}
|
||||
|
||||
|
|
@ -358,12 +367,14 @@
|
|||
setTimeout(queryInstallerStatus, 5000);
|
||||
} else {
|
||||
$('#loading_indicator').css('display', 'none');
|
||||
addMessage('error',
|
||||
[{
|
||||
addMessage('error', [
|
||||
{
|
||||
// eslint-disable-next-line no-undef
|
||||
title: installLang.title,
|
||||
description: installLang.msg
|
||||
}]
|
||||
);
|
||||
// eslint-disable-next-line no-undef
|
||||
description: installLang.msg,
|
||||
},
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -385,7 +396,7 @@
|
|||
}
|
||||
|
||||
url = url.substring(0, position) + lookUp + '/installer/status';
|
||||
$.getJSON(url, function(data) {
|
||||
$.getJSON(url, data => {
|
||||
processTimeoutResponse(data.status);
|
||||
});
|
||||
}
|
||||
|
|
@ -398,7 +409,10 @@
|
|||
function pollContent(xhReq) {
|
||||
var messages = xhReq.responseText;
|
||||
var msgSeparator = '}\n\n';
|
||||
var unprocessed, messageEndIndex, endOfMessageIndex, message;
|
||||
var unprocessed;
|
||||
var messageEndIndex;
|
||||
var endOfMessageIndex;
|
||||
var message;
|
||||
|
||||
do {
|
||||
unprocessed = messages.substring(nextReadPosition);
|
||||
|
|
@ -466,7 +480,7 @@
|
|||
currentProgress = Math.floor(progressStart);
|
||||
|
||||
clearInterval(progressTimer);
|
||||
progressTimer = setInterval(function() {
|
||||
progressTimer = setInterval(() => {
|
||||
incrementFiller($progressText, $progressFiller, $progressFillerText, progressLimit);
|
||||
}, 10);
|
||||
}
|
||||
|
|
@ -487,7 +501,7 @@
|
|||
function startPolling(xhReq) {
|
||||
resetPolling();
|
||||
transmissionOver = false;
|
||||
pollTimer = setInterval(function () {
|
||||
pollTimer = setInterval(() => {
|
||||
pollContent(xhReq);
|
||||
}, 250);
|
||||
}
|
||||
|
|
@ -605,7 +619,9 @@
|
|||
function interceptFormSubmit($form) {
|
||||
if (!$form.length) {
|
||||
return;
|
||||
} else if ($form.find('input[name="admin_name"]').length > 0) {
|
||||
}
|
||||
|
||||
if ($form.find('input[name="admin_name"]').length > 0) {
|
||||
setAdminTimezone($form);
|
||||
}
|
||||
|
||||
|
|
@ -623,7 +639,8 @@
|
|||
function setAdminTimezone($form) {
|
||||
// Set admin timezone if it does not exist yet
|
||||
if ($form.find('input[name="admin_timezone"]').length === 0) {
|
||||
const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
// eslint-disable-next-line new-cap
|
||||
const { timeZone } = Intl.DateTimeFormat().resolvedOptions();
|
||||
|
||||
// Add timezone as form entry
|
||||
const timezoneEntry = $('<input type="hidden" name="admin_timezone" value="' + timeZone + '">');
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
/* global phpbb, plupload, attachInline */
|
||||
/* global phpbb, plupload, attachInline, activateSubPanel */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
plupload.addI18n(phpbb.plupload.i18n);
|
||||
phpbb.plupload.ids = [];
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
|
|
@ -19,9 +20,9 @@ phpbb.plupload.initialize = function() {
|
|||
phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData());
|
||||
|
||||
// Only execute if Plupload initialized successfully.
|
||||
phpbb.plupload.uploader.bind('Init', function() {
|
||||
phpbb.plupload.uploader.bind('Init', () => {
|
||||
phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0];
|
||||
let $attachRowTemplate = $('#attach-row-tpl');
|
||||
const $attachRowTemplate = $('#attach-row-tpl');
|
||||
$attachRowTemplate.removeClass('attach-row-tpl');
|
||||
phpbb.plupload.rowTpl = $attachRowTemplate[0].outerHTML;
|
||||
|
||||
|
|
@ -31,7 +32,7 @@ phpbb.plupload.initialize = function() {
|
|||
$('#attach-panel-multi').show();
|
||||
});
|
||||
|
||||
phpbb.plupload.uploader.bind('PostInit', function() {
|
||||
phpbb.plupload.uploader.bind('PostInit', () => {
|
||||
// Point out the drag-and-drop zone if it's supported.
|
||||
if (phpbb.plupload.uploader.features.dragdrop) {
|
||||
$('#drag-n-drop-message').show();
|
||||
|
|
@ -41,7 +42,8 @@ phpbb.plupload.initialize = function() {
|
|||
if ($('#attach-panel-multi').is(':visible')) {
|
||||
phpbb.plupload.uploader.refresh();
|
||||
}
|
||||
$('[data-subpanel="attach-panel"]').one('click', function() {
|
||||
|
||||
$('[data-subpanel="attach-panel"]').one('click', () => {
|
||||
phpbb.plupload.uploader.refresh();
|
||||
});
|
||||
});
|
||||
|
|
@ -54,7 +56,7 @@ phpbb.plupload.initialize = function() {
|
|||
phpbb.plupload.clearParams = function() {
|
||||
var obj = phpbb.plupload.uploader.settings.multipart_params;
|
||||
for (var key in obj) {
|
||||
if (!obj.hasOwnProperty(key) || key.indexOf('attachment_data[') !== 0) {
|
||||
if (!Object.prototype.hasOwnProperty.call(obj, key) || key.indexOf('attachment_data[') !== 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -68,7 +70,7 @@ phpbb.plupload.clearParams = function() {
|
|||
* @param {object} obj
|
||||
*/
|
||||
phpbb.plupload.updateMultipartParams = function(obj) {
|
||||
var settings = phpbb.plupload.uploader.settings;
|
||||
var { settings } = phpbb.plupload.uploader;
|
||||
settings.multipart_params = $.extend(settings.multipart_params, obj);
|
||||
};
|
||||
|
||||
|
|
@ -83,7 +85,7 @@ phpbb.plupload.getSerializedData = function() {
|
|||
for (var i = 0; i < phpbb.plupload.data.length; i++) {
|
||||
var datum = phpbb.plupload.data[i];
|
||||
for (var key in datum) {
|
||||
if (!datum.hasOwnProperty(key)) {
|
||||
if (!Object.prototype.hasOwnProperty.call(datum, key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -108,7 +110,7 @@ phpbb.plupload.getSerializedData = function() {
|
|||
*/
|
||||
phpbb.plupload.getIndex = function(attachId) {
|
||||
var index = $.inArray(Number(attachId), phpbb.plupload.ids);
|
||||
return (index !== -1) ? index : false;
|
||||
return index === -1 ? false : index;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -119,7 +121,8 @@ phpbb.plupload.getIndex = function(attachId) {
|
|||
*/
|
||||
phpbb.plupload.setData = function(data) {
|
||||
// Make sure that the array keys are reset.
|
||||
phpbb.plupload.ids = phpbb.plupload.data = [];
|
||||
phpbb.plupload.ids = [];
|
||||
phpbb.plupload.data = [];
|
||||
phpbb.plupload.data = data;
|
||||
|
||||
for (var i = 0; i < data.length; i++) {
|
||||
|
|
@ -136,7 +139,6 @@ phpbb.plupload.setData = function(data) {
|
|||
* @param {Array} downloadUrl Optional array of download urls to update.
|
||||
*/
|
||||
phpbb.plupload.update = function(data, action, index, downloadUrl) {
|
||||
|
||||
phpbb.plupload.updateBbcode(action, index);
|
||||
phpbb.plupload.setData(data);
|
||||
phpbb.plupload.updateRows(downloadUrl);
|
||||
|
|
@ -184,13 +186,13 @@ phpbb.plupload.insertRow = function(file) {
|
|||
* @param {Array} downloadUrl Optional array of download urls to update.
|
||||
*/
|
||||
phpbb.plupload.updateRow = function(index, downloadUrl) {
|
||||
var attach = phpbb.plupload.data[index],
|
||||
row = $('[data-attach-id="' + attach.attach_id + '"]');
|
||||
var attach = phpbb.plupload.data[index];
|
||||
var row = $('[data-attach-id="' + attach.attach_id + '"]');
|
||||
|
||||
// Add the link to the file
|
||||
if (typeof downloadUrl !== 'undefined' && typeof downloadUrl[index] !== 'undefined') {
|
||||
var url = downloadUrl[index].replace('&', '&'),
|
||||
link = $('<a></a>');
|
||||
var url = downloadUrl[index].replace('&', '&');
|
||||
var link = $('<a></a>');
|
||||
|
||||
link.attr('href', url).html(attach.real_filename);
|
||||
row.find('.file-name').html(link);
|
||||
|
|
@ -211,8 +213,8 @@ phpbb.plupload.updateHiddenData = function(row, attach, index) {
|
|||
row.find('input[type="hidden"]').remove();
|
||||
|
||||
for (var key in attach) {
|
||||
if (!attach.hasOwnProperty(key)) {
|
||||
return;
|
||||
if (!Object.prototype.hasOwnProperty.call(attach, key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
var input = $('<input />')
|
||||
|
|
@ -238,7 +240,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
|
|||
var file = phpbb.plupload.uploader.getFile(row.attr('id'));
|
||||
phpbb.plupload.uploader.removeFile(file);
|
||||
|
||||
row.slideUp(100, function() {
|
||||
row.slideUp(100, () => {
|
||||
row.remove();
|
||||
phpbb.plupload.hideEmptyList();
|
||||
});
|
||||
|
|
@ -250,6 +252,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
|
|||
if (index === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
var fields = {};
|
||||
fields['delete_file[' + index + ']'] = 1;
|
||||
|
||||
|
|
@ -289,7 +292,8 @@ phpbb.plupload.deleteFile = function(row, attachId) {
|
|||
var file = phpbb.plupload.uploader.getFile(row.attr('id'));
|
||||
phpbb.plupload.uploader.removeFile(file);
|
||||
}
|
||||
row.slideUp(100, function() {
|
||||
|
||||
row.slideUp(100, () => {
|
||||
row.remove();
|
||||
// Hide the file list if it's empty now.
|
||||
phpbb.plupload.hideEmptyList();
|
||||
|
|
@ -300,7 +304,7 @@ phpbb.plupload.deleteFile = function(row, attachId) {
|
|||
$.ajax(phpbb.plupload.config.url, {
|
||||
type: 'POST',
|
||||
data: $.extend(fields, phpbb.plupload.getSerializedData()),
|
||||
headers: phpbb.plupload.config.headers
|
||||
headers: phpbb.plupload.config.headers,
|
||||
})
|
||||
.always(always)
|
||||
.done(done);
|
||||
|
|
@ -325,9 +329,9 @@ phpbb.plupload.hideEmptyList = function() {
|
|||
* @param {int} index The index of the attachment from phpbb.plupload.ids that was affected.
|
||||
*/
|
||||
phpbb.plupload.updateBbcode = function(action, index) {
|
||||
var textarea = $('#message', phpbb.plupload.form),
|
||||
text = textarea.val(),
|
||||
removal = (action === 'removal');
|
||||
const textarea = $('#message', phpbb.plupload.form);
|
||||
var text = textarea.val();
|
||||
var removal = (action === 'removal');
|
||||
|
||||
// Return if the bbcode isn't used at all.
|
||||
if (text.indexOf('[attachment=') === -1) {
|
||||
|
|
@ -336,11 +340,12 @@ phpbb.plupload.updateBbcode = function(action, index) {
|
|||
|
||||
function runUpdate(i) {
|
||||
var regex = new RegExp('\\[attachment=' + i + '\\](.*?)\\[\\/attachment\\]', 'g');
|
||||
text = text.replace(regex, function updateBbcode(_, fileName) {
|
||||
text = text.replace(regex, (_, fileName) => {
|
||||
// Remove the bbcode if the file was removed.
|
||||
if (removal && index === i) {
|
||||
return '';
|
||||
}
|
||||
|
||||
var newIndex = i + ((removal) ? -1 : 1);
|
||||
return '[attachment=' + newIndex + ']' + fileName + '[/attachment]';
|
||||
});
|
||||
|
|
@ -373,7 +378,7 @@ phpbb.plupload.updateBbcode = function(action, index) {
|
|||
phpbb.plupload.getFilesByStatus = function(status) {
|
||||
var files = [];
|
||||
|
||||
$.each(phpbb.plupload.uploader.files, function(i, file) {
|
||||
$.each(phpbb.plupload.uploader.files, (i, file) => {
|
||||
if (file.status === status) {
|
||||
files.push(file);
|
||||
}
|
||||
|
|
@ -402,10 +407,13 @@ phpbb.plupload.handleMaxFilesReached = function() {
|
|||
phpbb.plupload.uploader.trigger('Error', { message: phpbb.plupload.lang.TOO_MANY_ATTACHMENTS });
|
||||
|
||||
return true;
|
||||
} else if (phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
|
||||
}
|
||||
|
||||
if (phpbb.plupload.maxFiles > phpbb.plupload.ids.length) {
|
||||
// Enable the uploader if the user is under the limit
|
||||
phpbb.plupload.enableUploader();
|
||||
}
|
||||
|
||||
return false;
|
||||
};
|
||||
|
||||
|
|
@ -433,7 +441,7 @@ phpbb.plupload.enableUploader = function() {
|
|||
phpbb.plupload.markQueuedFailed = function(error) {
|
||||
var files = phpbb.plupload.getFilesByStatus(plupload.QUEUED);
|
||||
|
||||
$.each(files, function(i, file) {
|
||||
$.each(files, (i, file) => {
|
||||
$('#' + file.id).find('.file-progress').hide();
|
||||
phpbb.plupload.fileError(file, error);
|
||||
});
|
||||
|
|
@ -452,11 +460,10 @@ phpbb.plupload.fileError = function(file, error) {
|
|||
.addClass('file-error')
|
||||
.attr({
|
||||
'data-error-title': phpbb.plupload.lang.ERROR,
|
||||
'data-error-message': error
|
||||
'data-error-message': error,
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Set up the Plupload object and get some basic data.
|
||||
*/
|
||||
|
|
@ -466,17 +473,21 @@ phpbb.plupload.initialize();
|
|||
/**
|
||||
* Add a file filter to check for max file sizes per mime type.
|
||||
*/
|
||||
plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
|
||||
plupload.addFileFilter('mime_types_max_file_size', (types, file, callback) => {
|
||||
if (file.size !== 'undefined') {
|
||||
$(types).each(function(i, type) {
|
||||
let extensions = [],
|
||||
extsArray = type.extensions.split(',');
|
||||
$(types).each((i, type) => {
|
||||
const extensions = [];
|
||||
const extsArray = type.extensions.split(',');
|
||||
|
||||
$(extsArray).each(function(i, extension) {
|
||||
/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
|
||||
$(extsArray).each((i, extension) => {
|
||||
if (/^\s*\*\s*$/.test(extension)) {
|
||||
extensions.push('\\.*');
|
||||
} else {
|
||||
extensions.push('\\.' + extension.replace(new RegExp('[' + '/^$.*+?|()[]{}\\'.replace(/./g, '\\$&') + ']', 'g'), '\\$&'));
|
||||
}
|
||||
});
|
||||
|
||||
let regex = new RegExp("(" + extensions.join("|") + ")$", "i");
|
||||
const regex = new RegExp('(' + extensions.join('|') + ')$', 'i');
|
||||
|
||||
if (regex.test(file.name)) {
|
||||
if (type.max_file_size !== 'undefined' && type.max_file_size) {
|
||||
|
|
@ -484,7 +495,7 @@ plupload.addFileFilter('mime_types_max_file_size', function(types, file, callbac
|
|||
phpbb.plupload.uploader.trigger('Error', {
|
||||
code: plupload.FILE_SIZE_ERROR,
|
||||
message: plupload.translate('File size error.'),
|
||||
file: file
|
||||
file,
|
||||
});
|
||||
|
||||
callback(false);
|
||||
|
|
@ -507,8 +518,8 @@ var $fileList = $('#file-list');
|
|||
* Insert inline attachment bbcode.
|
||||
*/
|
||||
$fileList.on('click', '.file-inline-bbcode', function(e) {
|
||||
var attachId = $(this).parents('.attach-row').attr('data-attach-id'),
|
||||
index = phpbb.plupload.getIndex(attachId);
|
||||
var attachId = $(this).parents('.attach-row').attr('data-attach-id');
|
||||
var index = phpbb.plupload.getIndex(attachId);
|
||||
|
||||
attachInline(index, phpbb.plupload.data[index].real_filename);
|
||||
e.preventDefault();
|
||||
|
|
@ -518,8 +529,8 @@ $fileList.on('click', '.file-inline-bbcode', function(e) {
|
|||
* Delete a file.
|
||||
*/
|
||||
$fileList.on('click', '.file-delete', function(e) {
|
||||
var row = $(this).parents('.attach-row'),
|
||||
attachId = row.attr('data-attach-id');
|
||||
var row = $(this).parents('.attach-row');
|
||||
var attachId = row.attr('data-attach-id');
|
||||
|
||||
phpbb.plupload.deleteFile(row, attachId);
|
||||
e.preventDefault();
|
||||
|
|
@ -536,7 +547,7 @@ $fileList.on('click', '.file-error', function(e) {
|
|||
/**
|
||||
* Fires when an error occurs.
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('Error', function(up, error) {
|
||||
phpbb.plupload.uploader.bind('Error', (up, error) => {
|
||||
error.file.name = plupload.xmlEncode(error.file.name);
|
||||
|
||||
// The error message that Plupload provides for these is vague, so we'll be more specific.
|
||||
|
|
@ -545,6 +556,7 @@ phpbb.plupload.uploader.bind('Error', function(up, error) {
|
|||
} else if (error.code === plupload.FILE_SIZE_ERROR) {
|
||||
error.message = plupload.translate('File too large:') + ' ' + error.file.name;
|
||||
}
|
||||
|
||||
phpbb.alert(phpbb.plupload.lang.ERROR, error.message);
|
||||
});
|
||||
|
||||
|
|
@ -556,7 +568,7 @@ phpbb.plupload.uploader.bind('Error', function(up, error) {
|
|||
* @param {object} up The plupload.Uploader object
|
||||
* @param {object} file The plupload.File object that is about to be uploaded
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
|
||||
phpbb.plupload.uploader.bind('BeforeUpload', (up, file) => {
|
||||
if (phpbb.plupload.handleMaxFilesReached()) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -574,7 +586,7 @@ phpbb.plupload.uploader.bind('BeforeUpload', function(up, file) {
|
|||
* been uploaded
|
||||
* @param {object} response The response object from the server
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
|
||||
phpbb.plupload.uploader.bind('ChunkUploaded', (up, file, response) => {
|
||||
if (response.chunk >= response.chunks - 1) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -582,14 +594,14 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
|
|||
var json = {};
|
||||
try {
|
||||
json = $.parseJSON(response.response);
|
||||
} catch (e) {
|
||||
} catch {
|
||||
file.status = plupload.FAILED;
|
||||
up.trigger('FileUploaded', file, {
|
||||
response: JSON.stringify({
|
||||
error: {
|
||||
message: 'Error parsing server response.'
|
||||
}
|
||||
})
|
||||
message: 'Error parsing server response.',
|
||||
},
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -603,9 +615,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
|
|||
up.trigger('FileUploaded', file, {
|
||||
response: JSON.stringify({
|
||||
error: {
|
||||
message: json.error.message
|
||||
}
|
||||
})
|
||||
message: json.error.message,
|
||||
},
|
||||
}),
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -613,7 +625,7 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
|
|||
/**
|
||||
* Fires when files are added to the queue.
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
|
||||
phpbb.plupload.uploader.bind('FilesAdded', (up, files) => {
|
||||
// Prevent unnecessary requests to the server if the user already uploaded
|
||||
// the maximum number of files allowed.
|
||||
if (phpbb.plupload.handleMaxFilesReached()) {
|
||||
|
|
@ -631,11 +643,11 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
|
|||
$fileListContainer.show(100);
|
||||
}
|
||||
|
||||
$.each(files, function(i, file) {
|
||||
$.each(files, (i, file) => {
|
||||
phpbb.plupload.insertRow(file);
|
||||
});
|
||||
|
||||
up.bind('UploadProgress', function(up, file) {
|
||||
up.bind('UploadProgress', (up, file) => {
|
||||
$('.file-progress-bar', '#' + file.id).css('width', file.percent + '%');
|
||||
$('#file-total-progress-bar').css('width', up.total.percent + '%');
|
||||
});
|
||||
|
|
@ -647,7 +659,6 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
|
|||
up.start();
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* Fires when an entire file has been uploaded. It checks for errors
|
||||
* returned by the server otherwise parses the list of attachment data and
|
||||
|
|
@ -659,17 +670,17 @@ phpbb.plupload.uploader.bind('FilesAdded', function(up, files) {
|
|||
* uploaded
|
||||
* @param {string} response The response string from the server
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
|
||||
var json = {},
|
||||
row = $('#' + file.id),
|
||||
error;
|
||||
phpbb.plupload.uploader.bind('FileUploaded', (up, file, response) => {
|
||||
var json = {};
|
||||
var row = $('#' + file.id);
|
||||
var error;
|
||||
|
||||
// Hide the progress indicator.
|
||||
row.find('.file-progress').hide();
|
||||
|
||||
try {
|
||||
json = JSON.parse(response.response);
|
||||
} catch (e) {
|
||||
} catch {
|
||||
error = 'Error parsing server response.';
|
||||
}
|
||||
|
||||
|
|
@ -699,9 +710,9 @@ phpbb.plupload.uploader.bind('FileUploaded', function(up, file, response) {
|
|||
/**
|
||||
* Fires when the entire queue of files have been uploaded.
|
||||
*/
|
||||
phpbb.plupload.uploader.bind('UploadComplete', function() {
|
||||
phpbb.plupload.uploader.bind('UploadComplete', () => {
|
||||
// Hide the progress bar
|
||||
setTimeout(function() {
|
||||
setTimeout(() => {
|
||||
$('#file-total-progress-bar').fadeOut(500, function() {
|
||||
$(this).css('width', 0).show();
|
||||
});
|
||||
|
|
@ -710,5 +721,4 @@ phpbb.plupload.uploader.bind('UploadComplete', function() {
|
|||
// Re-enable the uploader
|
||||
phpbb.plupload.enableUploader();
|
||||
});
|
||||
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
'use strict';
|
||||
|
||||
// This callback will mark all forum icons read
|
||||
|
|
@ -11,13 +12,13 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
|
|||
var iconsArray = {
|
||||
forum_unread: 'forum_read',
|
||||
forum_unread_subforum: 'forum_read_subforum',
|
||||
forum_unread_locked: 'forum_read_locked'
|
||||
forum_unread_locked: 'forum_read_locked',
|
||||
};
|
||||
|
||||
$('li.row').find('dl[class*="forum_unread"]').each(function() {
|
||||
var $this = $(this);
|
||||
|
||||
$.each(iconsArray, function(unreadClass, readClass) {
|
||||
$.each(iconsArray, (unreadClass, readClass) => {
|
||||
if ($this.hasClass(unreadClass)) {
|
||||
$this.removeClass(unreadClass).addClass(readClass);
|
||||
}
|
||||
|
|
@ -45,17 +46,16 @@ phpbb.addAjaxCallback('mark_forums_read', function(res) {
|
|||
* @param {bool} [update_topic_links=true] Whether "Mark topics read" links
|
||||
* should be updated. Defaults to true.
|
||||
*/
|
||||
phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
|
||||
phpbb.addAjaxCallback('mark_topics_read', (res, updateTopicLinks) => {
|
||||
var readTitle = res.NO_UNREAD_POSTS;
|
||||
var unreadTitle = res.UNREAD_POSTS;
|
||||
var iconsArray = {
|
||||
global_unread: 'global_read',
|
||||
announce_unread: 'announce_read',
|
||||
sticky_unread: 'sticky_read',
|
||||
topic_unread: 'topic_read'
|
||||
topic_unread: 'topic_read',
|
||||
};
|
||||
var iconsState = [ '', '_hot', '_hot_mine', '_locked', '_locked_mine', '_mine' ];
|
||||
var unreadClassSelectors;
|
||||
var classMap = {};
|
||||
var classNames = [];
|
||||
|
||||
|
|
@ -63,22 +63,23 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
|
|||
updateTopicLinks = true;
|
||||
}
|
||||
|
||||
$.each(iconsArray, function(unreadClass, readClass) {
|
||||
$.each(iconsState, function(key, value) {
|
||||
$.each(iconsArray, (unreadClass, readClass) => {
|
||||
$.each(iconsState, (key, value) => {
|
||||
// Only topics can be hot
|
||||
if ((value === '_hot' || value === '_hot_mine') && unreadClass !== 'topic_unread') {
|
||||
return true;
|
||||
}
|
||||
|
||||
classMap[unreadClass + value] = readClass + value;
|
||||
classNames.push(unreadClass + value);
|
||||
});
|
||||
});
|
||||
|
||||
unreadClassSelectors = '.' + classNames.join(',.');
|
||||
var unreadClassSelectors = '.' + classNames.join(',.');
|
||||
|
||||
$('li.row').find(unreadClassSelectors).each(function() {
|
||||
var $this = $(this);
|
||||
$.each(classMap, function(unreadClass, readClass) {
|
||||
$.each(classMap, (unreadClass, readClass) => {
|
||||
if ($this.hasClass(unreadClass)) {
|
||||
$this.removeClass(unreadClass).addClass(readClass);
|
||||
}
|
||||
|
|
@ -98,7 +99,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
|
|||
});
|
||||
|
||||
// This callback will mark all notifications read
|
||||
phpbb.addAjaxCallback('notification.mark_all_read', function(res) {
|
||||
phpbb.addAjaxCallback('notification.mark_all_read', res => {
|
||||
if (typeof res.success !== 'undefined') {
|
||||
phpbb.markNotifications($('[data-notification-unread="true"]'), 0);
|
||||
phpbb.toggleDropdown.call($('#notification-button'));
|
||||
|
|
@ -147,8 +148,8 @@ phpbb.markNotifications = function($popup, unreadCount) {
|
|||
|
||||
// This callback finds the post from the delete link, and removes it.
|
||||
phpbb.addAjaxCallback('post_delete', function() {
|
||||
var $this = $(this),
|
||||
postId;
|
||||
var $this = $(this);
|
||||
var postId;
|
||||
|
||||
if ($this.attr('data-refresh') === undefined) {
|
||||
postId = $this[0].href.split('&p=')[1];
|
||||
|
|
@ -158,6 +159,7 @@ phpbb.addAjaxCallback('post_delete', function() {
|
|||
post.nextAll('.bg2').removeClass('bg2').addClass('bg1');
|
||||
posts1.removeClass('bg1').addClass('bg2');
|
||||
}
|
||||
|
||||
post.fadeOut(function() {
|
||||
$(this).remove();
|
||||
});
|
||||
|
|
@ -185,7 +187,7 @@ phpbb.addAjaxCallback('row_delete', function() {
|
|||
});
|
||||
|
||||
// This handles friend / foe additions removals.
|
||||
phpbb.addAjaxCallback('zebra', function(res) {
|
||||
phpbb.addAjaxCallback('zebra', res => {
|
||||
var zebra;
|
||||
|
||||
if (res.success) {
|
||||
|
|
@ -210,6 +212,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
height = (typeof height === 'undefined') ? panel.find('.inner').outerHeight() : height;
|
||||
panel.css('min-height', height);
|
||||
};
|
||||
|
||||
updatePanelHeight();
|
||||
|
||||
// Remove the View results link
|
||||
|
|
@ -217,13 +220,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
poll.find('.poll_view_results').hide(500);
|
||||
}
|
||||
|
||||
if (!res.can_vote) {
|
||||
poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, function () {
|
||||
poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
|
||||
});
|
||||
} else {
|
||||
if (res.can_vote) {
|
||||
// If the user can still vote, simply slide down the results
|
||||
poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
|
||||
} else {
|
||||
poll.find('.polls, .poll_max_votes, .poll_vote, .poll_option_select').fadeOut(500, () => {
|
||||
poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show();
|
||||
});
|
||||
}
|
||||
|
||||
// Get the votes count of the highest poll option
|
||||
|
|
@ -242,16 +245,16 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
var optionId = $this.attr('data-poll-option-id');
|
||||
var voted = (typeof res.user_votes[optionId] !== 'undefined');
|
||||
var mostVoted = (res.vote_counts[optionId] === mostVotes);
|
||||
var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100);
|
||||
var percent = res.total_votes ? Math.round((res.vote_counts[optionId] / res.total_votes) * 100) : 0;
|
||||
var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100);
|
||||
var altText;
|
||||
|
||||
altText = $this.attr('data-alt-text');
|
||||
var altText = $this.attr('data-alt-text');
|
||||
if (voted) {
|
||||
$this.attr('title', $.trim(altText));
|
||||
} else {
|
||||
$this.attr('title', '');
|
||||
};
|
||||
}
|
||||
|
||||
$this.toggleClass('voted', voted);
|
||||
$this.toggleClass('most-votes', mostVoted);
|
||||
|
||||
|
|
@ -260,7 +263,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
var barTimeLapse = (res.can_vote) ? 500 : 1500;
|
||||
var newBarClass = (percent === 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
|
||||
|
||||
setTimeout(function () {
|
||||
setTimeout(() => {
|
||||
bar.animate({ width: percentRel + '%' }, 500)
|
||||
.removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5')
|
||||
.addClass(newBarClass)
|
||||
|
|
@ -282,13 +285,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
updatePanelHeight();
|
||||
}
|
||||
|
||||
$(this).delay(5000).fadeOut(500, function() {
|
||||
$(this).delay(5000).fadeOut(500, () => {
|
||||
resizePanel(300);
|
||||
});
|
||||
});
|
||||
|
||||
// Remove the gap resulting from removing options
|
||||
setTimeout(function() {
|
||||
setTimeout(() => {
|
||||
resizePanel(500);
|
||||
}, 1500);
|
||||
|
||||
|
|
@ -298,7 +301,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
|
|||
|
||||
if (panelHeight !== innerHeight) {
|
||||
panel.css({ minHeight: '', height: panelHeight })
|
||||
.animate({ height: innerHeight }, time, function () {
|
||||
.animate({ height: innerHeight }, time, () => {
|
||||
panel.css({ minHeight: innerHeight, height: '' });
|
||||
});
|
||||
}
|
||||
|
|
@ -325,14 +328,14 @@ $('[data-ajax]').each(function() {
|
|||
var filter = $this.attr('data-filter');
|
||||
|
||||
if (ajax !== 'false') {
|
||||
var fn = (ajax !== 'true') ? ajax : null;
|
||||
filter = (filter !== undefined) ? phpbb.getFunctionByName(filter) : null;
|
||||
var fn = ajax === 'true' ? null : ajax;
|
||||
filter = filter === undefined ? null : phpbb.getFunctionByName(filter);
|
||||
|
||||
phpbb.ajaxify({
|
||||
selector: this,
|
||||
refresh: $this.attr('data-refresh') !== undefined,
|
||||
filter: filter,
|
||||
callback: fn
|
||||
filter,
|
||||
callback: fn,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -341,12 +344,9 @@ $('[data-ajax]').each(function() {
|
|||
* This simply appends #preview to the action of the
|
||||
* QR action when you click the Full Editor & Preview button
|
||||
*/
|
||||
$('#qr_full_editor').click(function() {
|
||||
$('#qr_postform').attr('action', function(i, val) {
|
||||
return val + '#preview';
|
||||
$('#qr_full_editor').click(() => {
|
||||
$('#qr_postform').attr('action', (i, val) => val + '#preview');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* Make the display post links to use JS
|
||||
|
|
@ -367,7 +367,7 @@ $('.display_post').click(function(e) {
|
|||
$('.display_post_review').on('click', function(e) {
|
||||
e.preventDefault();
|
||||
|
||||
let $displayPostLink = $(this);
|
||||
const $displayPostLink = $(this);
|
||||
$displayPostLink.closest('.post-ignore').removeClass('post-ignore');
|
||||
$displayPostLink.hide();
|
||||
});
|
||||
|
|
@ -389,6 +389,7 @@ $('#member_search').click(function () {
|
|||
if ($memberlistSearch.is(':visible')) {
|
||||
$('#username').focus();
|
||||
}
|
||||
|
||||
return false;
|
||||
});
|
||||
|
||||
|
|
@ -408,7 +409,7 @@ if ($scrollTopButton.length) {
|
|||
});
|
||||
|
||||
// Scroll smoothly to the top when the button is clicked
|
||||
$scrollTopButton.click(function (e) {
|
||||
$scrollTopButton.click(e => {
|
||||
e.preventDefault(); // Prevent the default anchor link behavior
|
||||
$('html, body').animate({ scrollTop: 0 }, 500); // Smooth scroll to top
|
||||
});
|
||||
|
|
@ -417,11 +418,9 @@ if ($scrollTopButton.length) {
|
|||
/**
|
||||
* Automatically resize textarea
|
||||
*/
|
||||
$(function() {
|
||||
$(() => {
|
||||
var $textarea = $('textarea:not(#message-box textarea, .no-auto-resize)');
|
||||
phpbb.resizeTextArea($textarea, { minHeight: 75, maxHeight: 250 });
|
||||
phpbb.resizeTextArea($('textarea', '#message-box'));
|
||||
});
|
||||
|
||||
|
||||
})(jQuery); // Avoid conflicts with other libraries
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
/* eslint no-var:0 */
|
||||
|
||||
/**
|
||||
* phpBB forum functions
|
||||
|
|
@ -34,10 +37,10 @@ function popup(url, width, height, name) {
|
|||
function pageJump(item) {
|
||||
'use strict';
|
||||
|
||||
var page = parseInt(item.val(), 10),
|
||||
perPage = item.attr('data-per-page'),
|
||||
baseUrl = item.attr('data-base-url'),
|
||||
startName = item.attr('data-start-name');
|
||||
var page = parseInt(item.val(), 10);
|
||||
var perPage = item.attr('data-per-page');
|
||||
var baseUrl = item.attr('data-base-url');
|
||||
var startName = item.attr('data-start-name');
|
||||
|
||||
if (page !== null && !isNaN(page) && page === Math.floor(page) && page > 0) {
|
||||
if (baseUrl.indexOf('?') === -1) {
|
||||
|
|
@ -78,35 +81,34 @@ function viewableArea(e, itself) {
|
|||
e = e.parentNode;
|
||||
}
|
||||
|
||||
if (!e.vaHeight) {
|
||||
if (e.vaHeight) {
|
||||
// Restore viewable area height to the default
|
||||
e.style.height = e.vaHeight + 'px';
|
||||
e.style.overflow = 'auto';
|
||||
e.style.maxHeight = e.vaMaxHeight;
|
||||
e.vaHeight = false;
|
||||
} else {
|
||||
// Store viewable area height before changing style to auto
|
||||
e.vaHeight = e.offsetHeight;
|
||||
e.vaMaxHeight = e.style.maxHeight;
|
||||
e.style.height = 'auto';
|
||||
e.style.maxHeight = 'none';
|
||||
e.style.overflow = 'visible';
|
||||
} else {
|
||||
// Restore viewable area height to the default
|
||||
e.style.height = e.vaHeight + 'px';
|
||||
e.style.overflow = 'auto';
|
||||
e.style.maxHeight = e.vaMaxHeight;
|
||||
e.vaHeight = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Alternate display of subPanels
|
||||
*/
|
||||
jQuery(function($) {
|
||||
jQuery($ => {
|
||||
'use strict';
|
||||
|
||||
$('.sub-panels').each(function() {
|
||||
|
||||
var $childNodes = $('a[data-subpanel]', this),
|
||||
panels = $childNodes.map(function () {
|
||||
var $childNodes = $('a[data-subpanel]', this);
|
||||
var panels = $childNodes.map(function() {
|
||||
return this.getAttribute('data-subpanel');
|
||||
}),
|
||||
showPanel = this.getAttribute('data-show-panel');
|
||||
});
|
||||
var showPanel = this.getAttribute('data-show-panel');
|
||||
|
||||
if (panels.length) {
|
||||
activateSubPanel(showPanel, panels);
|
||||
|
|
@ -124,11 +126,13 @@ jQuery(function($) {
|
|||
function activateSubPanel(p, panels) {
|
||||
'use strict';
|
||||
|
||||
var i, showPanel;
|
||||
var i;
|
||||
var showPanel;
|
||||
|
||||
if (typeof p === 'string') {
|
||||
showPanel = p;
|
||||
}
|
||||
|
||||
$('input[name="show_panel"]').val(showPanel);
|
||||
|
||||
if (typeof panels === 'undefined') {
|
||||
|
|
@ -148,7 +152,8 @@ function selectCode(a) {
|
|||
|
||||
// Get ID of code block
|
||||
var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];
|
||||
var s, r;
|
||||
var s;
|
||||
var r;
|
||||
|
||||
// Not IE and IE9+
|
||||
if (window.getSelection) {
|
||||
|
|
@ -164,12 +169,11 @@ function selectCode(a) {
|
|||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Firefox and Opera
|
||||
else {
|
||||
// workaround for bug # 42885
|
||||
if (window.opera && e.innerHTML.substring(e.innerHTML.length - 4) === '<BR>') {
|
||||
e.innerHTML = e.innerHTML + ' ';
|
||||
e.innerHTML += ' ';
|
||||
}
|
||||
|
||||
r = document.createRange();
|
||||
|
|
@ -177,17 +181,15 @@ function selectCode(a) {
|
|||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
}
|
||||
}
|
||||
} else if (document.getSelection) {
|
||||
// Some older browsers
|
||||
else if (document.getSelection) {
|
||||
s = document.getSelection();
|
||||
r = document.createRange();
|
||||
r.selectNodeContents(e);
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
}
|
||||
} else if (document.selection) {
|
||||
// IE
|
||||
else if (document.selection) {
|
||||
r = document.body.createTextRange();
|
||||
r.moveToElementText(e);
|
||||
r.select();
|
||||
|
|
@ -229,7 +231,7 @@ function phpbbCheckKey(event) {
|
|||
/**
|
||||
* Apply onkeypress event for forcing default submit button on ENTER key press
|
||||
*/
|
||||
jQuery(function($) {
|
||||
jQuery($ => {
|
||||
'use strict';
|
||||
|
||||
$('form input[type=text], form input[type=password]').on('keypress', function(e) {
|
||||
|
|
@ -258,10 +260,10 @@ jQuery(function($) {
|
|||
function insertUser(formId, value) {
|
||||
'use strict';
|
||||
|
||||
var $form = jQuery(formId),
|
||||
formName = $form.attr('data-form-name'),
|
||||
fieldName = $form.attr('data-field-name'),
|
||||
item = opener.document.forms[formName][fieldName];
|
||||
var $form = jQuery(formId);
|
||||
var formName = $form.attr('data-form-name');
|
||||
var fieldName = $form.attr('data-field-name');
|
||||
var item = opener.document.forms[formName][fieldName];
|
||||
|
||||
if (item.value.length && item.type === 'textarea') {
|
||||
value = item.value + '\n' + value;
|
||||
|
|
@ -293,9 +295,9 @@ function insert_single_user(formId, user) {
|
|||
function parseDocument($container) {
|
||||
'use strict';
|
||||
|
||||
var test = document.createElement('div'),
|
||||
oldBrowser = (typeof test.style.borderRadius === 'undefined'),
|
||||
$body = $('body');
|
||||
var test = document.createElement('div');
|
||||
var oldBrowser = (typeof test.style.borderRadius === 'undefined');
|
||||
var $body = $('body');
|
||||
|
||||
/**
|
||||
* Reset avatar dimensions when changing URL or EMAIL
|
||||
|
|
@ -322,7 +324,7 @@ function parseDocument($container) {
|
|||
$container.find('.pagination .dropdown-trigger').click(function() {
|
||||
var $dropdownContainer = $(this).parent();
|
||||
// Wait a little bit to make sure the dropdown has activated
|
||||
setTimeout(function() {
|
||||
setTimeout(() => {
|
||||
if ($dropdownContainer.hasClass('dropdown-visible')) {
|
||||
$dropdownContainer.find('input.inputbox').focus();
|
||||
}
|
||||
|
|
@ -333,19 +335,18 @@ function parseDocument($container) {
|
|||
* Resize navigation (breadcrumbs) block to keep all links on same line
|
||||
*/
|
||||
$container.find('.navlinks').each(function() {
|
||||
var $this = $(this),
|
||||
$left = $this.children().not('.rightside'),
|
||||
$right = $this.children('.rightside');
|
||||
var $this = $(this);
|
||||
var $left = $this.children().not('.rightside');
|
||||
var $right = $this.children('.rightside');
|
||||
|
||||
if ($left.length !== 1 || !$right.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
function resize() {
|
||||
var width = 0,
|
||||
diff = $left.outerWidth(true) - $left.width(),
|
||||
minWidth = Math.max($this.width() / 3, 240),
|
||||
maxWidth;
|
||||
var width = 0;
|
||||
var diff = $left.outerWidth(true) - $left.width();
|
||||
var minWidth = Math.max($this.width() / 3, 240);
|
||||
|
||||
$right.each(function() {
|
||||
var $this = $(this);
|
||||
|
|
@ -354,7 +355,7 @@ function parseDocument($container) {
|
|||
}
|
||||
});
|
||||
|
||||
maxWidth = $this.width() - width - diff;
|
||||
var maxWidth = $this.width() - width - diff;
|
||||
$left.css('max-width', Math.floor(Math.max(maxWidth, minWidth)) + 'px');
|
||||
}
|
||||
|
||||
|
|
@ -366,14 +367,14 @@ function parseDocument($container) {
|
|||
* Makes breadcrumbs responsive
|
||||
*/
|
||||
$container.find('.breadcrumbs:not([data-skip-responsive])').each(function() {
|
||||
var $this = $(this),
|
||||
$links = $this.find('.crumb'),
|
||||
length = $links.length,
|
||||
classes = ['wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny'],
|
||||
classesLength = classes.length,
|
||||
maxHeight = 0,
|
||||
lastWidth = false,
|
||||
wrapped = false;
|
||||
var $this = $(this);
|
||||
var $links = $this.find('.crumb');
|
||||
var { length } = $links;
|
||||
var classes = [ 'wrapped-max', 'wrapped-wide', 'wrapped-medium', 'wrapped-small', 'wrapped-tiny' ];
|
||||
var classesLength = classes.length;
|
||||
var maxHeight = 0;
|
||||
var lastWidth = false;
|
||||
var wrapped = false;
|
||||
|
||||
// Set tooltips
|
||||
$this.find('a').each(function() {
|
||||
|
|
@ -383,8 +384,8 @@ function parseDocument($container) {
|
|||
|
||||
// Function that checks breadcrumbs
|
||||
function check() {
|
||||
var height = $this.height(),
|
||||
width;
|
||||
var height = $this.height();
|
||||
var width;
|
||||
|
||||
// Test max-width set in code for .navlinks above
|
||||
width = parseInt($this.css('max-width'), 10);
|
||||
|
|
@ -404,6 +405,7 @@ function parseDocument($container) {
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
lastWidth = width;
|
||||
|
||||
if (wrapped) {
|
||||
|
|
@ -454,23 +456,23 @@ function parseDocument($container) {
|
|||
* responsive-show-all to list of classes
|
||||
*/
|
||||
$container.find('.topiclist.responsive-show-all > li > dl').each(function() {
|
||||
var $this = $(this),
|
||||
$block = $this.find('dt .responsive-show:last-child'),
|
||||
first = true;
|
||||
var $this = $(this);
|
||||
var $block = $this.find('dt .responsive-show:last-child');
|
||||
var first = true;
|
||||
|
||||
// Create block that is visible only on mobile devices
|
||||
if (!$block.length) {
|
||||
if ($block.length) {
|
||||
first = ($.trim($block.text()).length === 0);
|
||||
} else {
|
||||
$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
|
||||
$block = $this.find('dt .responsive-show:last-child');
|
||||
} else {
|
||||
first = ($.trim($block.text()).length === 0);
|
||||
}
|
||||
|
||||
// Copy contents of each column
|
||||
$this.find('dd').not('.mark').each(function() {
|
||||
var column = $(this),
|
||||
$children = column.children(),
|
||||
html = column.html();
|
||||
var column = $(this);
|
||||
var $children = column.children();
|
||||
var html = column.html();
|
||||
|
||||
if ($children.length === 1 && $children.text() === column.text()) {
|
||||
html = $children.html();
|
||||
|
|
@ -490,13 +492,13 @@ function parseDocument($container) {
|
|||
* responsive-show-columns to list of classes
|
||||
*/
|
||||
$container.find('.topiclist.responsive-show-columns').each(function() {
|
||||
var $list = $(this),
|
||||
headers = [],
|
||||
headersLength = 0;
|
||||
var $list = $(this);
|
||||
var headers = [];
|
||||
var headersLength = 0;
|
||||
|
||||
// Find all headers, get contents
|
||||
$list.prev('.topiclist').find('li.header dd').not('.mark').each(function() {
|
||||
headers.push($("<div>").text($(this).text()).html());
|
||||
headers.push($('<div>').text($(this).text()).html());
|
||||
headersLength++;
|
||||
});
|
||||
|
||||
|
|
@ -506,23 +508,23 @@ function parseDocument($container) {
|
|||
|
||||
// Parse each row
|
||||
$list.find('dl').each(function() {
|
||||
var $this = $(this),
|
||||
$block = $this.find('dt .responsive-show:last-child'),
|
||||
first = true;
|
||||
var $this = $(this);
|
||||
var $block = $this.find('dt .responsive-show:last-child');
|
||||
var first = true;
|
||||
|
||||
// Create block that is visible only on mobile devices
|
||||
if (!$block.length) {
|
||||
if ($block.length) {
|
||||
first = ($.trim($block.text()).length === 0);
|
||||
} else {
|
||||
$this.find('dt > .list-inner').append('<div class="responsive-show" style="display:none;" />');
|
||||
$block = $this.find('dt .responsive-show:last-child');
|
||||
} else {
|
||||
first = ($.trim($block.text()).length === 0);
|
||||
}
|
||||
|
||||
// Copy contents of each column
|
||||
$this.find('dd').not('.mark').each(function(i) {
|
||||
var column = $(this),
|
||||
children = column.children(),
|
||||
html = column.html();
|
||||
var column = $(this);
|
||||
var children = column.children();
|
||||
var html = column.html();
|
||||
|
||||
if (children.length === 1 && children.text() === column.text()) {
|
||||
html = children.html();
|
||||
|
|
@ -544,24 +546,25 @@ function parseDocument($container) {
|
|||
* Responsive tables
|
||||
*/
|
||||
$container.find('table.table1').not('.not-responsive').each(function() {
|
||||
var $this = $(this),
|
||||
$th = $this.find('thead > tr > th'),
|
||||
headers = [],
|
||||
totalHeaders = 0,
|
||||
i, headersLength;
|
||||
var $this = $(this);
|
||||
var $th = $this.find('thead > tr > th');
|
||||
var headers = [];
|
||||
var totalHeaders = 0;
|
||||
var i;
|
||||
|
||||
// Find each header
|
||||
$th.each(function(column) {
|
||||
var cell = $(this),
|
||||
colspan = parseInt(cell.attr('colspan'), 10),
|
||||
dfn = cell.attr('data-dfn'),
|
||||
text = dfn ? dfn : cell.text();
|
||||
var cell = $(this);
|
||||
var colspan = parseInt(cell.attr('colspan'), 10);
|
||||
var dfn = cell.attr('data-dfn');
|
||||
var text = dfn ? dfn : cell.text();
|
||||
|
||||
colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
|
||||
|
||||
for (i = 0; i < colspan; i++) {
|
||||
headers.push(text);
|
||||
}
|
||||
|
||||
totalHeaders++;
|
||||
|
||||
if (dfn && !column) {
|
||||
|
|
@ -569,7 +572,7 @@ function parseDocument($container) {
|
|||
}
|
||||
});
|
||||
|
||||
headersLength = headers.length;
|
||||
var headersLength = headers.length;
|
||||
|
||||
// Add header text to each cell as <dfn>
|
||||
$this.addClass('responsive');
|
||||
|
|
@ -580,9 +583,9 @@ function parseDocument($container) {
|
|||
}
|
||||
|
||||
$this.find('tbody > tr').each(function() {
|
||||
var row = $(this),
|
||||
cells = row.children('td'),
|
||||
column = 0;
|
||||
var row = $(this);
|
||||
var cells = row.children('td');
|
||||
var column = 0;
|
||||
|
||||
if (cells.length === 1) {
|
||||
row.addClass('big-column');
|
||||
|
|
@ -590,9 +593,9 @@ function parseDocument($container) {
|
|||
}
|
||||
|
||||
cells.each(function() {
|
||||
var cell = $(this),
|
||||
colspan = parseInt(cell.attr('colspan'), 10),
|
||||
text = $.trim(cell.text());
|
||||
var cell = $(this);
|
||||
var colspan = parseInt(cell.attr('colspan'), 10);
|
||||
var text = $.trim(cell.text());
|
||||
|
||||
if (headersLength <= column) {
|
||||
return;
|
||||
|
|
@ -600,7 +603,7 @@ function parseDocument($container) {
|
|||
|
||||
if ((text.length && text !== '-') || cell.children().length) {
|
||||
if (headers[column].length) {
|
||||
cell.prepend($("<dfn>").css('display', 'none').text(headers[column]));
|
||||
cell.prepend($('<dfn>').css('display', 'none').text(headers[column]));
|
||||
}
|
||||
} else {
|
||||
cell.addClass('empty');
|
||||
|
|
@ -626,15 +629,15 @@ function parseDocument($container) {
|
|||
* Responsive tabs
|
||||
*/
|
||||
$container.find('#tabs, #minitabs').not('[data-skip-responsive]').each(function() {
|
||||
var $this = $(this),
|
||||
$ul = $this.children(),
|
||||
$tabs = $ul.children().not('[data-skip-responsive]'),
|
||||
$links = $tabs.children('a'),
|
||||
$item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab'),
|
||||
$menu = $item.find('.dropdown-contents'),
|
||||
maxHeight = 0,
|
||||
lastWidth = false,
|
||||
responsive = false;
|
||||
var $this = $(this);
|
||||
var $ul = $this.children();
|
||||
var $tabs = $ul.children().not('[data-skip-responsive]');
|
||||
var $links = $tabs.children('a');
|
||||
var $item = $ul.append('<li class="tab responsive-tab" style="display:none;"><a href="javascript:void(0);" class="responsive-tab-link"> </a><div class="dropdown tab-dropdown" style="display: none;"><div class="pointer"><div class="pointer-inner"></div></div><ul class="dropdown-contents" /></div></li>').find('li.responsive-tab');
|
||||
var $menu = $item.find('.dropdown-contents');
|
||||
var maxHeight = 0;
|
||||
var lastWidth = false;
|
||||
var responsive = false;
|
||||
|
||||
$links.each(function() {
|
||||
var $this = $(this);
|
||||
|
|
@ -642,8 +645,8 @@ function parseDocument($container) {
|
|||
});
|
||||
|
||||
function check() {
|
||||
var width = $body.width(),
|
||||
height = $this.height();
|
||||
var width = $body.width();
|
||||
var height = $this.height();
|
||||
|
||||
if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) {
|
||||
return;
|
||||
|
|
@ -658,6 +661,7 @@ function parseDocument($container) {
|
|||
if ($item.hasClass('dropdown-visible')) {
|
||||
phpbb.toggleDropdown.call($item.find('a.responsive-tab-link').get(0));
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -665,29 +669,31 @@ function parseDocument($container) {
|
|||
$item.show();
|
||||
$menu.html('');
|
||||
|
||||
var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)'),
|
||||
total = $availableTabs.length,
|
||||
i, $tab;
|
||||
var $availableTabs = $tabs.filter(':not(.activetab, .responsive-tab)');
|
||||
var total = $availableTabs.length;
|
||||
var i;
|
||||
var $tab;
|
||||
|
||||
for (i = total - 1; i >= 0; i--) {
|
||||
$tab = $availableTabs.eq(i);
|
||||
$menu.prepend($tab.clone(true).removeClass('tab'));
|
||||
$tab.hide();
|
||||
if ($this.height() <= maxHeight) {
|
||||
$menu.find('a').click(function() {
|
||||
$menu.find('a').click(() => {
|
||||
check(true);
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
$menu.find('a').click(function() {
|
||||
|
||||
$menu.find('a').click(() => {
|
||||
check(true);
|
||||
});
|
||||
}
|
||||
|
||||
var $tabLink = $item.find('a.responsive-tab-link');
|
||||
phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
|
||||
visibleClass: 'activetab'
|
||||
visibleClass: 'activetab',
|
||||
});
|
||||
|
||||
check(true);
|
||||
|
|
@ -708,23 +714,26 @@ function parseDocument($container) {
|
|||
* Replace responsive text
|
||||
*/
|
||||
$container.find('[data-responsive-text]').each(function() {
|
||||
var $this = $(this),
|
||||
fullText = $this.text(),
|
||||
responsiveText = $this.attr('data-responsive-text'),
|
||||
responsive = false;
|
||||
var $this = $(this);
|
||||
var fullText = $this.text();
|
||||
var responsiveText = $this.attr('data-responsive-text');
|
||||
var responsive = false;
|
||||
|
||||
function check() {
|
||||
if ($(window).width() > 700) {
|
||||
if (!responsive) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this.text(fullText);
|
||||
responsive = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (responsive) {
|
||||
return;
|
||||
}
|
||||
|
||||
$this.text(responsiveText);
|
||||
responsive = true;
|
||||
}
|
||||
|
|
@ -737,7 +746,7 @@ function parseDocument($container) {
|
|||
/**
|
||||
* Run onload functions
|
||||
*/
|
||||
jQuery(function($) {
|
||||
jQuery($ => {
|
||||
'use strict';
|
||||
|
||||
// Swap .nojs and .hasjs
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue