mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00
Code Issues Releases Wiki Activity

[ticket/16405] Update code for eslint and stylelint updates

Browse Source 
PHPBB3-16405
This commit is contained in:
Marc Alexander 2022-04-16 17:06:12 +02:00
parent 68cb599354
commit 620ee4d85b
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.stylelintrc
View File

@ -61,10 +61,10 @@
"declaration-empty-line-before": "never",
"declaration-property-unit-blacklist": {
"declaration-property-unit-disallowed-list": {
"line-height": ["rem", "em", "%"]
},
"declaration-property-unit-whitelist": {
"declaration-property-unit-allowed-list": {
"height": ["px", "%", "vh"],
"width": ["px", "%", "vw"],
"font-size": ["px", "rem", "%"],

8
phpBB/adm/style/admin.css
View File

@ -11,8 +11,8 @@
/* stylelint-disable selector-max-id */
/* stylelint-disable selector-max-compound-selectors */
/* stylelint-disable selector-no-qualifying-type */
/* stylelint-disable declaration-property-unit-blacklist */
/* stylelint-disable declaration-property-unit-whitelist */
/* stylelint-disable declaration-property-unit-disallowed-list */
/* stylelint-disable declaration-property-unit-allowed-list */
/* General markup styles
---------------------------------------- */
@ -3021,8 +3021,8 @@ fieldset.permissions .permissions-switch {
/* stylelint-enable selector-max-id */
/* stylelint-enable selector-max-compound-selectors */
/* stylelint-enable selector-no-qualifying-type */
/* stylelint-enable declaration-property-unit-blacklist */
/* stylelint-enable declaration-property-unit-whitelist */
/* stylelint-enable declaration-property-unit-disallowed-list */
/* stylelint-enable declaration-property-unit-allowed-list */
.acp-icon-move-up,
.acp-icon-move-down {

10
phpBB/assets/javascript/mentions.js
View File

@ -194,9 +194,7 @@
});
// Sort names by priorities - higher values come first
_results = _results.sort((a, b) => {
return b.priority - a.priority;
});
_results = _results.sort((a, b) => b.priority - a.priority);
// Exact match is the most important - should come above anything else
$.each(_exactMatch, (name, value) => {
@ -233,9 +231,9 @@
* 2) We have enough names to display OR
* all relevant names have been fetched from the server
*/
if (cachedNamesForQuery &&
(getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit ||
cachedAll[cachedKeyword])) {
if (cachedNamesForQuery
&& (getMatchedNames(query, cachedNamesForQuery, cachedSearchKey).length >= mentionNamesLimit
|| cachedAll[cachedKeyword])) {
callback(cachedNamesForQuery);
return;
}

4
phpBB/styles/prosilver/theme/common.css
View File

@ -1227,14 +1227,14 @@ ul.linklist:after,
content: "";
}
/* stylelint-disable declaration-property-unit-whitelist */
/* stylelint-disable declaration-property-unit-allowed-list */
.emoji {
width: 1em;
min-width: 18px;
height: 1em;
min-height: 18px;
}
/* stylelint-enable declaration-property-unit-whitelist */
/* stylelint-enable declaration-property-unit-allowed-list */
.smilies {
vertical-align: text-bottom;

4
phpBB/styles/prosilver/theme/print.css
View File

@ -220,13 +220,13 @@ code { display: block; }
display: none;
}
/* stylelint-disable declaration-property-unit-whitelist */
/* stylelint-disable declaration-property-unit-allowed-list */
.emoji {
width: 1em;
min-width: 18px;
height: 1em;
min-height: 18px;
}
/* stylelint-enable declaration-property-unit-whitelist */
/* stylelint-enable declaration-property-unit-allowed-list */
/* stylelint-enable selector-max-compound-selectors */