aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/editor.js
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-11-21 13:41:03 -0800
committerNathan Guse <nathaniel.guse@gmail.com>2013-11-21 13:41:03 -0800
commit6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4 (patch)
tree940086df78617fc7d036d631eb5b4eb820e09b7c /phpBB/assets/javascript/editor.js
parent20885ccb8cef8d497ceacc232d3d864d5c07c455 (diff)
parent97915b467ed2a0f15805b43155eb24ac8b326c35 (diff)
downloadforums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar
forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.gz
forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.bz2
forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.tar.xz
forums-6f419b0049c5b4ec2bba9fc40a8515a35ced6fb4.zip
Merge pull request #1869 from prototech/ticket/10810
[ticket/10810] Move color swatches from popup windows to inline blocks.
Diffstat (limited to 'phpBB/assets/javascript/editor.js')
-rw-r--r--phpBB/assets/javascript/editor.js61
1 files changed, 0 insertions, 61 deletions
diff --git a/phpBB/assets/javascript/editor.js b/phpBB/assets/javascript/editor.js
index 418dd163aa..5222de9fee 100644
--- a/phpBB/assets/javascript/editor.js
+++ b/phpBB/assets/javascript/editor.js
@@ -295,67 +295,6 @@ function storeCaret(textEl) {
}
/**
-* Color pallette
-*/
-function colorPalette(dir, width, height) {
- var r = 0,
- g = 0,
- b = 0,
- numberList = new Array(6),
- color = '',
- html = '';
-
- numberList[0] = '00';
- numberList[1] = '40';
- numberList[2] = '80';
- numberList[3] = 'BF';
- numberList[4] = 'FF';
-
- html += '<table>';
-
- for (r = 0; r < 5; r++) {
- if (dir == 'h') {
- html += '<tr>';
- }
-
- for (g = 0; g < 5; g++) {
- if (dir == 'v') {
- html += '<tr>';
- }
-
- for (b = 0; b < 5; b++) {
- color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
- html += '<td style="background-color: #' + color + '; width: ' + width + 'px; height: ' + height + 'px;">';
- html += '<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;" style="display: block; width: ' + width + 'px; height: ' + height + 'px; " alt="#' + color + '" title="#' + color + '"></a>';
- html += '</td>';
- }
-
- if (dir == 'v') {
- html += '</tr>';
- }
- }
-
- if (dir == 'h') {
- html += '</tr>';
- }
- }
- html += '</table>';
- return html;
-}
-
-(function($) {
- $(document).ready(function() {
- $('#color_palette_placeholder').each(function() {
- var orientation = $(this).attr('data-orientation'),
- height = $(this).attr('data-height'),
- width = $(this).attr('data-width');
-
- $(this).html(colorPalette(orientation, width, height));
- });
- });
-})(jQuery);
-
-/**
* Caret Position object
*/
function caretPosition() {