diff options
| author | Callum Macrae <callum@macr.ae> | 2015-05-30 14:55:42 +0200 |
|---|---|---|
| committer | Callum Macrae <callum@macr.ae> | 2015-05-30 14:55:42 +0200 |
| commit | a39a421acb3d0e2c6b8d8f20974e90ea3625b065 (patch) | |
| tree | 34f2db8212ac1b333f507a21f85079719626b53d /phpBB | |
| parent | bafd649eea74daa85799858e2406d5b6bdcb080b (diff) | |
| download | forums-a39a421acb3d0e2c6b8d8f20974e90ea3625b065.tar forums-a39a421acb3d0e2c6b8d8f20974e90ea3625b065.tar.gz forums-a39a421acb3d0e2c6b8d8f20974e90ea3625b065.tar.bz2 forums-a39a421acb3d0e2c6b8d8f20974e90ea3625b065.tar.xz forums-a39a421acb3d0e2c6b8d8f20974e90ea3625b065.zip | |
[ticket/13898] Allow underscores :(
PHPBB3-13898
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/.jscsrc | 1 | ||||
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 |
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>'; } |