aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/.jscsrc1
-rw-r--r--phpBB/assets/javascript/core.js6
2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/.jscsrc b/phpBB/.jscsrc
index 4b516fcbe9..9dd5ab82e6 100644
--- a/phpBB/.jscsrc
+++ b/phpBB/.jscsrc
@@ -49,7 +49,6 @@
"requireSpaceAfterBinaryOperators": [
"=", "+", "+=", "-", "-=", "/", "/=", "*", "*=", "===", "!==", "<", "<=", ">", ">="
],
- "requireCamelCaseOrUpperCaseIdentifiers": true,
"disallowKeywords": ["with"],
"disallowMultipleLineStrings": true,
"disallowMixedSpacesAndTabs": "smart",
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index efa6ecbc74..5709941286 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1439,9 +1439,9 @@ phpbb.colorPalette = function(dir, width, height) {
for (b = 0; b < 5; b++) {
color = '' + numberList[r] + numberList[g] + numberList[b];
- html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">';
- html += '<a href="#" data-color="' + color + '" style="display: block; width: ' + width + 'px; height: ' +
- height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
+ html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' +
+ height + 'px;"><a href="#" data-color="' + color + '" style="display: block; width: ' +
+ width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
html += '</td>';
}