makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages 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. * @param {jQuery} el jQuery object for the palette container.
*/ */
phpbb.registerPalette = function(el) { 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'), height = el.attr('data-height'),
width = el.attr('data-width'), width = el.attr('data-width'),
target = el.attr('data-target'), target = el.attr('data-target'),
@ -1797,7 +1797,7 @@ $(function() {
phpbb.registerPageDropdowns(); phpbb.registerPageDropdowns();
$('[data-color-palette]').each(function() { $('[data-color-palette], [data-orientation]').each(function() {
phpbb.registerPalette($(this)); phpbb.registerPalette($(this));
}); });