diff options
| author | Cesar G <prototech91@gmail.com> | 2013-10-18 21:23:53 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-12 18:11:56 -0800 |
| commit | 79b5e9689617df62030be13f8b9912aee32e7bcb (patch) | |
| tree | faefca092b7b088a8eeb183e94c55943f12102a7 /phpBB/assets | |
| parent | c386bf7911edfc4613c6a70dae37db76bfe645cb (diff) | |
| download | forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.gz forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.bz2 forums-79b5e9689617df62030be13f8b9912aee32e7bcb.tar.xz forums-79b5e9689617df62030be13f8b9912aee32e7bcb.zip | |
[ticket/11472] Make the color swatch configurable and fix it in subsilver2
PHPBB3-11472
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/editor.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js index 66a3cb51ac..418dd163aa 100644 --- a/phpBB/assets/javascript/editor.js +++ b/phpBB/assets/javascript/editor.js @@ -346,7 +346,11 @@ function colorPalette(dir, width, height) { (function($) { $(document).ready(function() { $('#color_palette_placeholder').each(function() { - $(this).html(colorPalette('h', 15, 12)); + var orientation = $(this).attr('data-orientation'), + height = $(this).attr('data-height'), + width = $(this).attr('data-width'); + + $(this).html(colorPalette(orientation, width, height)); }); }); })(jQuery); |