From 79b5e9689617df62030be13f8b9912aee32e7bcb Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Fri, 18 Oct 2013 21:23:53 -0700
Subject: [ticket/11472] Make the color swatch configurable and fix it in
 subsilver2

PHPBB3-11472
---
 phpBB/assets/javascript/editor.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'phpBB/assets/javascript')

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);
-- 
cgit v1.2.1