aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-01 11:36:25 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-01 11:36:25 +0100
commit8b4892b96b3f0b609c24024b4ce4975a3344a82f (patch)
tree6d7db3144b83b22a40a4c2fbb9a8e5658c752587
parent5d5c3481b7968955c0457030e9c9dbc88a2ace15 (diff)
parent68326c6aa16a4bab7f813fb8e36a336675443d63 (diff)
downloadforums-8b4892b96b3f0b609c24024b4ce4975a3344a82f.tar
forums-8b4892b96b3f0b609c24024b4ce4975a3344a82f.tar.gz
forums-8b4892b96b3f0b609c24024b4ce4975a3344a82f.tar.bz2
forums-8b4892b96b3f0b609c24024b4ce4975a3344a82f.tar.xz
forums-8b4892b96b3f0b609c24024b4ce4975a3344a82f.zip
Merge pull request #5758 from VSEphpbb/ticket/16241
[ticket/16241] Color Palette backwards compatibility
-rw-r--r--phpBB/assets/javascript/core.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 5023d2906e..bedbd23532 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1587,7 +1587,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'),
@@ -1801,7 +1801,7 @@ $(function() {
phpbb.registerPageDropdowns();
- $('[data-color-palette]').each(function() {
+ $('[data-color-palette], [data-orientation]').each(function() {
phpbb.registerPalette($(this));
});