mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-09 03:28:51 +00:00
Merge pull request #6822 from iMattPro/ticket/17517
Ticket/17517 Update eslint and lint all phpbb JS files
This commit is contained in:
Marc Alexander
GitHub
commit
3cc7076513
14 changed files with 1356 additions and 847 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,6 @@
|
|||
/* global phpbb */
|
||||
/* eslint no-var: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
|
||||
/**
|
||||
* phpBB ACP functions
|
||||
|
|
@ -10,7 +12,7 @@
|
|||
function parse_document(container)
|
||||
{
|
||||
var test = document.createElement('div'),
|
||||
oldBrowser = (typeof test.style.borderRadius == 'undefined');
|
||||
oldBrowser = (typeof test.style.borderRadius === 'undefined');
|
||||
|
||||
test.remove();
|
||||
|
||||
|
|
@ -79,7 +81,7 @@ function parse_document(container)
|
|||
dfn = cell.attr('data-dfn'),
|
||||
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++) {
|
||||
|
|
@ -108,7 +110,7 @@ function parse_document(container)
|
|||
cells = row.children('td'),
|
||||
column = 0;
|
||||
|
||||
if (cells.length == 1) {
|
||||
if (cells.length === 1) {
|
||||
row.addClass('big-column');
|
||||
return;
|
||||
}
|
||||
|
|
@ -124,7 +126,7 @@ 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 {
|
||||
|
|
@ -156,7 +158,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');
|
||||
}
|
||||
});
|
||||
|
|
@ -194,7 +196,7 @@ function parse_document(container)
|
|||
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(),
|
||||
|
|
@ -273,7 +275,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,4 +1,5 @@
|
|||
/* global phpbb, statsData */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
|
|
@ -74,7 +75,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,7 +91,7 @@ phpbb.prepareSendStats = function () {
|
|||
data: statsData,
|
||||
success: returnHandler,
|
||||
error: errorHandler,
|
||||
cache: false
|
||||
cache: false,
|
||||
}).always(function() {
|
||||
if ($loadingIndicator && $loadingIndicator.is(':visible')) {
|
||||
$loadingIndicator.fadeOut(phpbb.alertTime);
|
||||
|
|
@ -176,7 +177,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 +188,7 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
|||
|
||||
return {
|
||||
privateKey: privateKeyString,
|
||||
publicKey: publicKeyString
|
||||
publicKey: publicKeyString,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('Error generating keys with SubtleCrypto:', error);
|
||||
|
|
@ -203,8 +204,8 @@ phpbb.addAjaxCallback('generate_vapid_keys', () => {
|
|||
const privateKeyInput = document.querySelector('#webpush_vapid_private');
|
||||
publicKeyInput.value = keyPair.publicKey;
|
||||
privateKeyInput.value = keyPair.privateKey;
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* Handler for submitting permissions form in chunks
|
||||
|
|
@ -286,14 +287,14 @@ 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) {
|
||||
$previousPageForm.append($('<input>').attr({
|
||||
type: 'text',
|
||||
name: 'forum_id[]',
|
||||
value: value
|
||||
value: value,
|
||||
}));
|
||||
});
|
||||
|
||||
|
|
@ -314,14 +315,14 @@ function submitPermissions() {
|
|||
// 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) {
|
||||
$form.append($('<input>').attr({
|
||||
type: 'text',
|
||||
name: 'forum_id[]',
|
||||
value: value
|
||||
value: value,
|
||||
}));
|
||||
});
|
||||
|
||||
|
|
@ -365,7 +366,7 @@ function submitPermissions() {
|
|||
'&' + $form.children('input[type=hidden]').serialize() +
|
||||
'&' + $form.find('input[type=checkbox][name^=inherit]').serialize(),
|
||||
success: handlePermissionReturn,
|
||||
error: handlePermissionReturn
|
||||
error: handlePermissionReturn,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -379,7 +380,7 @@ $('[data-ajax]').each(function() {
|
|||
phpbb.ajaxify({
|
||||
selector: this,
|
||||
refresh: $this.attr('data-refresh') !== undefined,
|
||||
callback: fn
|
||||
callback: fn,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -412,7 +413,7 @@ $(function() {
|
|||
} else {
|
||||
dateoptionInput.value = this.value;
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
if ($('#acp_help_phpbb')) {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
/* global phpbb */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
/*
|
||||
javascript for Bubble Tooltips by Alessandro Fulciniti
|
||||
|
|
@ -30,8 +31,8 @@ phpbb.enableTooltipsSelect = function (id, headline, subId) {
|
|||
hold = $('<span />', {
|
||||
id: '_tooltip_container',
|
||||
css: {
|
||||
position: 'absolute'
|
||||
}
|
||||
position: 'absolute',
|
||||
},
|
||||
});
|
||||
|
||||
$('body').append(hold);
|
||||
|
|
@ -73,8 +74,8 @@ phpbb.prepareTooltips = function ($element, headText) {
|
|||
$title = $('<span />', {
|
||||
class: 'top',
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
})
|
||||
.append(document.createTextNode(headText));
|
||||
|
||||
|
|
@ -82,15 +83,15 @@ phpbb.prepareTooltips = function ($element, headText) {
|
|||
class: 'bottom',
|
||||
html: text,
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
});
|
||||
|
||||
$tooltip = $('<span />', {
|
||||
class: 'tooltip',
|
||||
css: {
|
||||
display: 'block'
|
||||
}
|
||||
display: 'block',
|
||||
},
|
||||
})
|
||||
.append($title)
|
||||
.append($desc);
|
||||
|
|
@ -135,12 +136,12 @@ phpbb.positionTooltip = function ($element) {
|
|||
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,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* global bbfontstyle */
|
||||
/* eslint no-var: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
|
||||
var phpbb = {};
|
||||
phpbb.alertTime = 100;
|
||||
|
|
@ -13,7 +15,7 @@ var keymap = {
|
|||
ENTER: 13,
|
||||
ESC: 27,
|
||||
ARROW_UP: 38,
|
||||
ARROW_DOWN: 40
|
||||
ARROW_DOWN: 40,
|
||||
};
|
||||
|
||||
var $dark = $('#darkenwrapper');
|
||||
|
|
@ -363,7 +365,7 @@ phpbb.ajaxify = function(options) {
|
|||
type: 'POST',
|
||||
data: data + '&confirm=' + res.YES_VALUE + '&' + $('form', '#phpbb_confirm').serialize(),
|
||||
success: returnHandler,
|
||||
error: errorHandler
|
||||
error: errorHandler,
|
||||
});
|
||||
}, false);
|
||||
}
|
||||
|
|
@ -383,7 +385,7 @@ phpbb.ajaxify = function(options) {
|
|||
submit = $this.find('input[type="submit"][data-clicked]');
|
||||
data.push({
|
||||
name: submit.attr('name'),
|
||||
value: submit.val()
|
||||
value: submit.val(),
|
||||
});
|
||||
}
|
||||
} else if (isText) {
|
||||
|
|
@ -409,7 +411,7 @@ phpbb.ajaxify = function(options) {
|
|||
data: data,
|
||||
success: returnHandler,
|
||||
error: errorHandler,
|
||||
cache: false
|
||||
cache: false,
|
||||
});
|
||||
|
||||
request.always(function() {
|
||||
|
|
@ -445,10 +447,10 @@ phpbb.ajaxify = function(options) {
|
|||
|
||||
phpbb.search = {
|
||||
cache: {
|
||||
data: []
|
||||
data: [],
|
||||
},
|
||||
tpl: [],
|
||||
container: []
|
||||
container: [],
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -609,7 +611,7 @@ phpbb.search.filter = function(data, event, sendRequest) {
|
|||
if (cache.results[keyword]) {
|
||||
var response = {
|
||||
keyword: keyword,
|
||||
results: cache.results[keyword]
|
||||
results: cache.results[keyword],
|
||||
};
|
||||
phpbb.search.handleResponse(response, $this, true);
|
||||
proceed = false;
|
||||
|
|
@ -1079,7 +1081,7 @@ phpbb.addAjaxCallback('toggle_link', function() {
|
|||
$this.attr('href', toggleUrl);
|
||||
|
||||
// Toggle Icon
|
||||
$this.children().first().toggleClass('is-active').next().toggleClass('is-active')
|
||||
$this.children().first().toggleClass('is-active').next().toggleClass('is-active');
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -1113,7 +1115,7 @@ phpbb.resizeTextArea = function($items, options) {
|
|||
maxHeight: 500,
|
||||
heightDiff: 200,
|
||||
resizeCallback: function() {},
|
||||
resetCallback: function() {}
|
||||
resetCallback: function() {},
|
||||
};
|
||||
|
||||
if (phpbb.isTouch) {
|
||||
|
|
@ -1152,7 +1154,7 @@ phpbb.resizeTextArea = function($items, options) {
|
|||
|
||||
var maxHeight = Math.min(
|
||||
Math.max(windowHeight - configuration.heightDiff, configuration.minHeight),
|
||||
configuration.maxHeight
|
||||
configuration.maxHeight,
|
||||
),
|
||||
$item = $(item),
|
||||
height = parseInt($item.innerHeight(), 10),
|
||||
|
|
@ -1434,7 +1436,7 @@ phpbb.toggleDropdown = function(event_) {
|
|||
marginLeft: 0,
|
||||
left: 0,
|
||||
marginRight: 0,
|
||||
maxWidth: (windowWidth - 4) + 'px'
|
||||
maxWidth: (windowWidth - 4) + 'px',
|
||||
});
|
||||
|
||||
var offset = $this.offset().left,
|
||||
|
|
@ -1468,7 +1470,7 @@ phpbb.toggleDropdown = function(event_) {
|
|||
var maxOffset = Math.min(contentWidth, fullFreeSpace) + 'px';
|
||||
options.dropdown.css({
|
||||
width: maxOffset,
|
||||
marginLeft: -maxOffset
|
||||
marginLeft: -maxOffset,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
|
|
@ -1512,7 +1514,7 @@ phpbb.registerDropdown = function(toggle, dropdown, options) {
|
|||
leftClass: 'dropdown-left', // Class to add to parent item when dropdown opens to left side
|
||||
rightClass: 'dropdown-right', // Class to add to parent item when dropdown opens to right side
|
||||
upClass: 'dropdown-up', // Class to add to parent item when dropdown opens above menu item
|
||||
downClass: 'dropdown-down' // Class to add to parent item when dropdown opens below menu item
|
||||
downClass: 'dropdown-down', // Class to add to parent item when dropdown opens below menu item
|
||||
};
|
||||
if (options) {
|
||||
ops = $.extend(ops, options);
|
||||
|
|
@ -1716,7 +1718,7 @@ phpbb.registerPageDropdowns = function() {
|
|||
$contents = $this.find('.dropdown'),
|
||||
options = {
|
||||
direction: 'auto',
|
||||
verticalDirection: 'auto'
|
||||
verticalDirection: 'auto',
|
||||
},
|
||||
data;
|
||||
|
||||
|
|
@ -1795,7 +1797,7 @@ phpbb.getEditorTextArea = function(formName, textareaName) {
|
|||
}
|
||||
|
||||
return doc.forms[formName].elements[textareaName];
|
||||
}
|
||||
};
|
||||
|
||||
phpbb.recaptcha = {
|
||||
button: null,
|
||||
|
|
@ -1826,7 +1828,7 @@ phpbb.recaptcha = {
|
|||
if (phpbb.recaptcha.v3.length) {
|
||||
grecaptcha.execute(
|
||||
phpbb.recaptcha.v3.data('recaptcha-v3'),
|
||||
{action: phpbb.recaptcha.v3.val()}
|
||||
{ action: phpbb.recaptcha.v3.val() },
|
||||
).then(function(token) {
|
||||
// Place the token inside the form
|
||||
phpbb.recaptcha.token.val(token);
|
||||
|
|
@ -1860,7 +1862,7 @@ phpbb.recaptcha = {
|
|||
|
||||
phpbb.recaptcha.form.submit();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
// reCAPTCHA v2 doesn't accept callback functions nested inside objects
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-undef: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
/**
|
||||
* bbCode control by subBlue design [ www.subBlue.com ]
|
||||
|
|
@ -100,7 +104,7 @@ function bbfontstyle(bbopen, bbclose) {
|
|||
// IE
|
||||
else if (document.selection) {
|
||||
var range = textarea.createTextRange();
|
||||
range.move("character", new_pos);
|
||||
range.move('character', new_pos);
|
||||
range.select();
|
||||
storeCaret(textarea);
|
||||
}
|
||||
|
|
@ -271,7 +275,7 @@ function formatAttributeValue(str) {
|
|||
// Return as-is if it contains none of: space, ' " \ or ]
|
||||
return str;
|
||||
}
|
||||
var singleQuoted = "'" + str.replace(/[\\']/g, '\\$&') + "'",
|
||||
var singleQuoted = '\'' + str.replace(/[\\']/g, '\\$&') + '\'',
|
||||
doubleQuoted = '"' + str.replace(/[\\"]/g, '\\$&') + '"';
|
||||
|
||||
return (singleQuoted.length < doubleQuoted.length) ? singleQuoted : doubleQuoted;
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
||||
|
|
@ -361,8 +364,8 @@
|
|||
addMessage('error',
|
||||
[ {
|
||||
title: installLang.title,
|
||||
description: installLang.msg
|
||||
}]
|
||||
description: installLang.msg,
|
||||
} ],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
/* global phpbb, plupload, attachInline */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
|
||||
plupload.addI18n(phpbb.plupload.i18n);
|
||||
phpbb.plupload.ids = [];
|
||||
|
|
@ -21,7 +24,7 @@ phpbb.plupload.initialize = function() {
|
|||
// Only execute if Plupload initialized successfully.
|
||||
phpbb.plupload.uploader.bind('Init', function() {
|
||||
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;
|
||||
|
||||
|
|
@ -300,7 +303,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);
|
||||
|
|
@ -452,7 +455,7 @@ 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,
|
||||
});
|
||||
};
|
||||
|
||||
|
|
@ -469,14 +472,14 @@ phpbb.plupload.initialize();
|
|||
plupload.addFileFilter('mime_types_max_file_size', function(types, file, callback) {
|
||||
if (file.size !== 'undefined') {
|
||||
$(types).each(function(i, type) {
|
||||
let extensions = [],
|
||||
const extensions = [],
|
||||
extsArray = type.extensions.split(',');
|
||||
|
||||
$(extsArray).each(function(i, extension) {
|
||||
/^\s*\*\s*$/.test(extension) ? extensions.push("\\.*") : extensions.push("\\." + extension.replace(new RegExp("[" + "/^$.*+?|()[]{}\\".replace(/./g, "\\$&") + "]", "g"), "\\$&"));
|
||||
/^\s*\*\s*$/.test(extension) ? extensions.push('\\.*') : 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 +487,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: file,
|
||||
});
|
||||
|
||||
callback(false);
|
||||
|
|
@ -587,9 +590,9 @@ phpbb.plupload.uploader.bind('ChunkUploaded', function(up, file, response) {
|
|||
up.trigger('FileUploaded', file, {
|
||||
response: JSON.stringify({
|
||||
error: {
|
||||
message: 'Error parsing server response.'
|
||||
}
|
||||
})
|
||||
message: 'Error parsing server response.',
|
||||
},
|
||||
}),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -603,9 +606,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,
|
||||
},
|
||||
}),
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-var: 0 */
|
||||
|
||||
(function($) { // Avoid conflicts with other libraries
|
||||
|
||||
|
|
@ -11,7 +13,7 @@ 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() {
|
||||
|
|
@ -52,7 +54,7 @@ phpbb.addAjaxCallback('mark_topics_read', function(res, updateTopicLinks) {
|
|||
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;
|
||||
|
|
@ -332,7 +334,7 @@ $('[data-ajax]').each(function() {
|
|||
selector: this,
|
||||
refresh: $this.attr('data-refresh') !== undefined,
|
||||
filter: filter,
|
||||
callback: fn
|
||||
callback: fn,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -367,7 +369,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();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
/* global phpbb */
|
||||
/* eslint camelcase: 0 */
|
||||
/* eslint no-unused-vars: 0 */
|
||||
/* eslint no-var:0 */
|
||||
|
||||
/**
|
||||
* phpBB forum functions
|
||||
|
|
@ -496,7 +499,7 @@ function parseDocument($container) {
|
|||
|
||||
// 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++;
|
||||
});
|
||||
|
||||
|
|
@ -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');
|
||||
|
|
@ -687,7 +690,7 @@ function parseDocument($container) {
|
|||
|
||||
var $tabLink = $item.find('a.responsive-tab-link');
|
||||
phpbb.registerDropdown($tabLink, $item.find('.dropdown'), {
|
||||
visibleClass: 'activetab'
|
||||
visibleClass: 'activetab',
|
||||
});
|
||||
|
||||
check(true);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue