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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2019-12-01 11:36:30 +01:00
commit cda0d62c12
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/assets/javascript/core.js
View File

@ -1583,7 +1583,7 @@ phpbb.colorPalette = function(dir, width, height) {
* @param {jQuery} el jQuery object for the palette container.
*/
phpbb.registerPalette = function(el) {
var orientation = el.attr('data-color-palette'),
var orientation = el.attr('data-color-palette') || el.attr('data-orientation'), // data-orientation kept for backwards compat.
height = el.attr('data-height'),
width = el.attr('data-width'),
target = el.attr('data-target'),
@ -1797,7 +1797,7 @@ $(function() {
phpbb.registerPageDropdowns();
$('[data-color-palette]').each(function() {
$('[data-color-palette], [data-orientation]').each(function() {
phpbb.registerPalette($(this));
});