Changeset 5256

Timestamp:

04/12/07 17:04:03 (2 years ago)

Author:

rob1n

Message:

Upgrade TinyMCE to 2.1.0. Props andy. fixes #3788

Files:

• trunk/wp-admin/wp-admin.css (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js (modified) (21 diffs)
• trunk/wp-includes/js/tinymce/plugins/paste/editor_plugin.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js (modified) (12 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/jscripts/color_picker.js (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/jscripts/link.js (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/langs/en.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (23 diffs)

trunk/wp-admin/wp-admin.css

@@ -555 +555 @@
-
-#postdivrich #content {
-.7em
+5px
-    line-height: 140%;
-}
@@ -630 +630 @@
-#title {
-    font-size: 1.7em;
-
+ 3px
-}
-

trunk/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js

@@ -1 +1 @@
-/**
-162 2007-01-03 16:16:52
+201 2007-02-12 15:56:56
- *
- * @author Moxiecode
@@ -15 +15 @@
-            author : 'Moxiecode Systems AB',
-            authorurl : 'http://tinymce.moxiecode.com',
-tinymce.moxiecode.com/tinymce/docs/plugin_autosave.html
+wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };

trunk/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js

@@ -1 +1 @@
-/**
-162 2007-01-03 16:16:52
+201 2007-02-12 15:56:56
- *
- * @author Moxiecode
@@ -15 +15 @@
-            author : 'Moxiecode Systems AB',
-            authorurl : 'http://tinymce.moxiecode.com',
-tinymce.moxiecode.com/tinymce/docs/plugin_directionality.html
+wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };

trunk/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js

@@ -1 +1 @@
-/**
-172 2007-01-09 11:37:11
+201 2007-02-12 15:56:56
- *
- * Moxiecode DHTML Windows script.
@@ -16 +16 @@
-            author : 'Moxiecode Systems AB',
-            authorurl : 'http://tinymce.moxiecode.com',
-tinymce.moxiecode.com/tinymce/docs/plugin_inlinepopups.html
+wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };
@@ -27 +27 @@
-
-TinyMCE_Engine.prototype.orgOpenWindow = TinyMCE_Engine.prototype.openWindow;
+TinyMCE_Engine.prototype.orgCloseWindow = TinyMCE_Engine.prototype.closeWindow;
-
-TinyMCE_Engine.prototype.openWindow = function(template, args) {
@@ -53 +54 @@
-        height = 200;
-
+    if (!(minWidth = parseInt(template['minWidth'])))
+        minWidth = 100;
+
+    if (!(minHeight = parseInt(template['minHeight'])))
+        minHeight = 100;
+
-    resizable = (args && args['resizable']) ? args['resizable'] : "no";
-    scrollbars = (args && args['scrollbars']) ? args['scrollbars'] : "no";
@@ -79 +86 @@
-    url += tinyMCE.settings['imp_version'] ? (url.indexOf('?')==-1?'?':'&') + 'ver=' + tinyMCE.settings['imp_version'] : ''; // WordPress cache buster
-
-
-
-
-
+
+
-
-TinyMCE_Engine.prototype.closeWindow = function(win) {
-
-
-
+
+
+
+
+
+
+
+
+
+
-        this.orgCloseWindow(win);
+
+    tinyMCE.selectedInstance.getWin().focus(); 
-};
-
@@ -136 +150 @@
-    this.addEvent(document, "mouseup", mcWindows.eventDispatcher);
-
+    this.addEvent(window, "resize", mcWindows.eventDispatcher);
+    this.addEvent(document, "scroll", mcWindows.eventDispatcher);
+
-    this.doc = document;
+};
+
+TinyMCE_Windows.prototype.getBounds = function() {
+    if (!this.bounds) {
+        var vp = tinyMCE.getViewPort(window);
+        var top, left, bottom, right, docEl = this.doc.documentElement;
+
+        top    = vp.top;
+        left   = vp.left;
+        bottom = vp.height + top - 2;
+        right  = vp.width  + left - 22; // TODO this number is platform dependant
+        // x1, y1, x2, y2
+        this.bounds = [left, top, right, bottom];
+    }
+    return this.bounds;
+};
+
+TinyMCE_Windows.prototype.clampBoxPosition = function(x, y, w, h, minW, minH) {
+    var bounds = this.getBounds();
+
+    x = Math.max(bounds[0], Math.min(bounds[2], x + w) - w);
+    y = Math.max(bounds[1], Math.min(bounds[3], y + h) - h);
+
+    return this.clampBoxSize(x, y, w, h, minW, minH);
+};
+
+TinyMCE_Windows.prototype.clampBoxSize = function(x, y, w, h, minW, minH) {
+    var bounds = this.getBounds();
+
+    return [
+        x, y,
+        Math.max(minW, Math.min(bounds[2], x + w) - x),
+        Math.max(minH, Math.min(bounds[3], y + h) - y)
+    ];
-};
-
@@ -187 +238 @@
-            mcWindows.selectedWindow.onFocus(e);
-            break;
+        case "scroll":
+        case "resize":
+            if (mcWindows.clampUpdateTimeout)
+                clearTimeout(mcWindows.clampUpdateTimeout);
+            mcWindows.clampEventType = e.type;
+            mcWindows.clampUpdateTimeout =
+                setTimeout(function () {mcWindows.updateClamping()}, 100);
+            break;
+    }
+};
+
+TinyMCE_Windows.prototype.updateClamping = function () {
+    var clamp, oversize, etype = mcWindows.clampEventType;
+
+    this.bounds = null; // Recalc window bounds on resize/scroll
+    this.clampUpdateTimeout = null;
+
+    for (var n in this.windows) {
+        win = this.windows[n];
+        if (typeof(win) == 'function' || ! win.winElement) continue;
+
+        clamp = mcWindows.clampBoxPosition(
+            win.left, win.top,
+            win.winElement.scrollWidth,
+            win.winElement.scrollHeight,
+            win.features.minWidth,
+            win.features.minHeight
+        );
+        oversize = (
+            clamp[2] != win.winElement.scrollWidth ||
+            clamp[3] != win.winElement.scrollHeight
+        ) ? true : false;
+
+        if (!oversize || win.features.resizable == "yes" || etype != "scroll")
+            win.moveTo(clamp[0], clamp[1]);
+        if (oversize && win.features.resizable == "yes")
+            win.resizeTo(clamp[2], clamp[3]);
-    }
-};
@@ -194 +282 @@
-        obj.attachEvent("on" + name, handler);
-    else
-tru
+fals
-};
-
@@ -218 +306 @@
-    options['width'] = "300";
-    options['height'] = "300";
+    options['minwidth'] = "100";
+    options['minheight'] = "100";
-    options['resizable'] = "yes";
-    options['minimizable'] = "yes";
@@ -241 +331 @@
-    options['width'] = parseInt(options['width']);
-    options['height'] = parseInt(options['height']);
+    options['minWidth'] = parseInt(options['minwidth']);
+    options['minHeight'] = parseInt(options['minheight']);
-
-    return options;
@@ -253 +345 @@
-
-    features = this.parseFeatures(features);
+
+    // Clamp specified dimensions
+    var clamp = mcWindows.clampBoxPosition(
+        features['left'], features['top'],
+        features['width'], features['height'],
+        features['minWidth'], features['minHeight']
+    );
+
+    features['left'] = clamp[0];
+    features['top'] = clamp[1];
+
+    if (features['resizable'] == "yes") {
+        features['width'] = clamp[2];
+        features['height'] = clamp[3];
+    }
-
-    // Create div
@@ -286 +393 @@
-    html += '<head>';
-    html += '<title>Wrapper iframe</title>';
+    if (this.isMac) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;width:100%;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
-    html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
-    html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
-    if ( this.isMac ) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
-    html += '</head>';
-    html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
@@ -298 +405 @@
-    html += '    <div class="mceWindowHeadTools">';
-    html += '      <a href="javascript:parent.mcWindows.windows[\'' + name + '\'].close();" target="_self" onmousedown="return false;" class="mceWindowClose"><img border="0" src="' + imgPath + '/window_close.gif" /></a>';
-
-
+
+
+
-    html += '    </div>';
-    html += '</div><div id="' + id + '_body" class="mceWindowBody" style="width: ' + width + 'px; height: ' + height + 'px;">';
@@ -448 +556 @@
-    div.setAttribute("height", (height));
-    div.style.position = "absolute";
+
-    div.style.left = left + "px";
-    div.style.top = top + "px";
@@ -474 +583 @@
-    iframe.setAttribute("width", iframeWidth);
-    iframe.setAttribute("height", iframeHeight);
-// 
+   // 
-    // iframe.setAttribute("allowtransparency", "false");
-    iframe.setAttribute("scrolling", "no");
@@ -523 +632 @@
-
-TinyMCE_Window.prototype.maximize = function() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -553 +679 @@
-    mcWindows.windows = mcWindowsNew;
-
-// 
+   // 
-
-    var e = mcWindows.doc.getElementById(this.id + "_iframe");
@@ -562 +688 @@
-
-    mcWindows.setDocumentLock(false);
-
-    tinyMCE.selectedInstance.getWin().focus(); // WordPress: focus on the editor after closing a popup
-};
-
-TinyMCE_Window.prototype.onMouseMove = function(e) {
-
-
-
+
-    // Calculate real X, Y
-    var dx = e.screenX - mcWindows.mouseDownScreenX;
@@ -576 +698 @@
-    switch (mcWindows.action) {
-        case "resize":
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-            mcWindows.cancelEvent(e);
@@ -605 +713 @@
-            this.left = mcWindows.mouseDownLayerX + (e.screenX - mcWindows.mouseDownScreenX);
-            this.top = mcWindows.mouseDownLayerY + (e.screenY - mcWindows.mouseDownScreenY);
-
-
+
-
-            mcWindows.cancelEvent(e);
-            break;
-    }
+};
+
+TinyMCE_Window.prototype.moveTo = function (x, y) {
+    this.left = x;
+    this.top = y;
+
+    this.winElement.style.left = this.left + "px";
+    this.winElement.style.top = this.top + "px";
+};
+
+TinyMCE_Window.prototype.resizeTo = function (width, height) {
+    this.wrapperIFrameElement.style.width = (width+2) + 'px';
+    this.wrapperIFrameElement.style.height = (height+2) + 'px';
+    this.wrapperIFrameElement.width = width+2;
+    this.wrapperIFrameElement.height = height+2;
+    this.winElement.style.width = width + 'px';
+    this.winElement.style.height = height + 'px';
+
+    height = height - this.deltaHeight;
+
+    this.containerElement.style.width = width + 'px';
+    this.iframeElement.style.width = width + 'px';
+    this.iframeElement.style.height = height + 'px';
+    this.bodyElement.style.width = width + 'px';
+    this.bodyElement.style.height = height + 'px';
+    this.headElement.style.width = width + 'px';
+    //this.statusElement.style.width = width + 'px';
+};
+
+TinyMCE_Window.prototype.updateClamping = function () {
+    var clamp, oversize;
+
+    clamp = mcWindows.clampBoxPosition(
+        this.left, this.top,
+        this.winElement.scrollWidth,
+        this.winElement.scrollHeight,
+        this.features.minWidth, this.features.minHeight
+    );
+    oversize = (
+        clamp[2] != this.winElement.scrollWidth ||
+        clamp[3] != this.winElement.scrollHeight
+    ) ? true : false;
+
+    this.moveTo(clamp[0], clamp[1]);
+    if (this.features.resizable == "yes" && oversize)
+        this.resizeTo(clamp[2], clamp[3]);
-};
-
@@ -639 +792 @@
-TinyMCE_Window.prototype.onMouseDown = function(e) {
-    var elm = mcWindows.isMSIE ? this.wrapperFrame.event.srcElement : e.target;
-
-    var scrollX = 0;//this.doc.body.scrollLeft;
-    var scrollY = 0;//this.doc.body.scrollTop;
-
-    mcWindows.mouseDownScreenX = e.screenX;

trunk/wp-includes/js/tinymce/plugins/paste/editor_plugin.js

@@ -1 +1 @@
-/**
-162 2007-01-03 16:16:52
+201 2007-02-12 15:56:56
- *
- * @author Moxiecode
@@ -15 +15 @@
-            author : 'Moxiecode Systems AB',
-            authorurl : 'http://tinymce.moxiecode.com',
-tinymce.moxiecode.com/tinymce/docs/plugin_paste.html
+wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste
-            version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-        };
@@ -23 +23 @@
-        if (tinyMCE.isMSIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false))
-            tinyMCE.addEvent(inst.getBody(), "paste", TinyMCE_PastePlugin._handlePasteEvent);
+    },
+
+    handleEvent : function(e) {
+        // Force paste dialog if non IE browser
+        if (!tinyMCE.isRealIE && tinyMCE.getParam("paste_auto_cleanup_on_paste", false) && e.ctrlKey && e.keyCode == 86 && e.type == "keydown") {
+            window.setTimeout('tinyMCE.selectedInstance.execCommand("mcePasteText",true)', 1);
+            return tinyMCE.cancelEvent(e);
+        }
+
+        return true;
-    },
-

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -516 +516 @@
-
-        // Tweak the widths
-
+1
-
-        if ( tinyMCE.isMSIE && !tinyMCE.isOpera ) {

trunk/wp-includes/js/tinymce/themes/advanced/css/editor_ui.css

@@ -12 +12 @@
-.mceToolbarTop {border-bottom: 1px solid #cccccc; padding-bottom: 1px;}
-.mceToolbarBottom {border-top: 1px solid #cccccc;}
-position: relative; left: 0; top: 0; display: block
+display: block; position: relative; left: 0; top: 0; width: 100%
-.mceStatusbarTop, .mceStatusbarBottom, .mceStatusbar {height: 20px;}
-.mceStatusbarTop .mceStatusbarPathText, .mceStatusbarBottom .mceStatusbarPathText, .mceStatusbar .mceStatusbarPathText {font-family: 'MS Sans Serif', sans-serif, Verdana, Arial; font-size: 9pt; padding: 2px; line-height: 16px; overflow: visible;}
@@ -50 +50 @@
-/* Menu */
-
-
+0
-.mceMenu a, .mceMenuTitle, .mceMenuDisabled {display: block; width: 100%; text-decoration: none; background-color: white; font-family: Tahoma, Verdana, Arial, Helvetica; font-size: 11px; line-height: 20px; color: black;}
-.mceMenu a:hover {background-color: #B6BDD2; color: black; text-decoration: none !important;}
@@ -62 +62 @@
-span.mceMenuLine {display: block; position: absolute; left: 0; top: -1px; background-color: #F5F4F2; width: 30px; height: 1px; overflow: hidden; padding-left: 0; padding-right: 0;}
-.mceColors table, .mceColors td {margin: 0; padding: 2px;}
-130px; margin: 0; padding: 0; margin-left: 3px; margin-bottom: 3px; text-align: center; border: 1px solid white
+auto; padding: 0; margin: 0 3px 3px 3px; text-align: center; border: 1px solid white; text-decoration: none !important
-.mceColorPreview {position: absolute; overflow:hidden; left: 0; top: 0; margin-left: 3px; margin-top: 15px; width: 16px; height: 4px; background-color: red;}
-a.mceMoreColors:hover {border: 1px solid #0A246A;}
@@ -78 +78 @@
-* html span.mceMenuButton, * html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
-* html span.mceMenuButton img, * html span.mceMenuButtonSelected img, * html span.mceMenuButtonFocus img {position: relative; top: 1px;}
-132px
+auto
-* html .mceColors td a {width: 10px; height: 10px;}
-* html .mceColorPreview {margin-left: 2px; margin-top: 14px;}
@@ -93 +93 @@
-*:first-child+html span.mceMenuButton, *:first-child+html span.mceMenuButtonFocus {position: relative; left: 0; top: 0;}
-*:first-child+html span.mceMenuButton img, *:first-child+html span.mceMenuButtonSelected img, *:first-child+html span.mceMenuButtonFocus img {position: relative; top: 1px;}
-2
+7
-*:first-child+html .mceColors td a {width: 10px; height: 10px;}
-*:first-child+html .mceColorPreview {margin: 0; padding-left: 4px; margin-top: 14px; width: 14px;}

trunk/wp-includes/js/tinymce/themes/advanced/editor_template.js

@@ -1 +1 @@
-/**
-166 2007-01-05 10:31:50
+218 2007-02-13 11:08:01
- *
- * @author Moxiecode
@@ -44 +44 @@
-        ['sup', 'sup.gif', 'lang_theme_sup_desc', 'superscript'],
-        ['forecolor', 'forecolor.gif', 'lang_theme_forecolor_desc', 'forecolor', true],
+        ['forecolorpicker', 'forecolor.gif', 'lang_theme_forecolor_desc', 'forecolorpicker', true],
-        ['backcolor', 'backcolor.gif', 'lang_theme_backcolor_desc', 'HiliteColor', true],
+        ['backcolorpicker', 'backcolor.gif', 'lang_theme_backcolor_desc', 'backcolorpicker', true],
-        ['charmap', 'charmap.gif', 'lang_theme_charmap_desc', 'mceCharMap'],
-        ['visualaid', 'visualaid.gif', 'lang_theme_visualaid_desc', 'mceToggleVisualAid'],
@@ -357 +359 @@
-                return false;
-
+            case "forecolorpicker":
+                this._pickColor(editor_id, 'forecolor');
+                return true;
+
-            case "forecolorMenu":
-                TinyMCE_AdvancedTheme._hideMenus(editor_id);
@@ -421 +427 @@
-                ml.show();
-            return true;
+    
+            case "backcolorpicker":
+                this._pickColor(editor_id, 'HiliteColor');
+                return true;
-
-            case "mceColorPicker":
-                if (user_interface) {
-
-
+
+
+
+
-
-                    template['file'] = 'color_picker.htm';
-22
-19
+38
+25
-                    template['close_previous'] = "no";
-
@@ -439 +451 @@
-
-                    tinyMCE.lastColorPickerValue = value;
-inputColor
+value['color']
-                } else {
-
-
+
+
+
+
+
+
+
+
-                    elm.value = value;
-
@@ -600 +618 @@
-                template['html'] = '<table class="mceEditor" border="0" cellpadding="0" cellspacing="0" width="{$width}" height="{$height}" style="width:{$width_style};height:{$height_style}"><tbody>';
-
-
-
-
+
+
-
-                if (statusbarLocation == "top") {
@@ -611 +628 @@
-                template['html'] += '<tr><td align="center"><span id="{$editor_id}"></span></td></tr>';
-
-
-
-
+
+
-
-                // External toolbar changes
@@ -739 +755 @@
-
-    removeInstance : function(inst) {
-
-
-
+
+
+
+
+
+
-    },
-
@@ -1225 +1244 @@
-            tableElm.style.width = w + "px";
-
+        if ( !tinyMCE.isMSIE || tinyMCE.isMSIE7 || tinyMCE.isOpera ) // WordPress: do this later to avoid creeping toolbar bug in MSIE6
-        tableElm.style.height = h + "px";
-
@@ -1233 +1253 @@
-        ih = ih < 1 ? 30 : ih;
-
+/* WordPress found that this led to a shrinking editor with every resize. (Gray background creeps in 1px at a time.)
-        if (tinyMCE.isGecko) {
-            iw -= 2;
-            ih -= 2;
-        }
+*/
-
-        if (set_w)
@@ -1253 +1275 @@
-            }
-        }
+
+        tableElm.style.height = h + "px"; // WordPress: see above
-
-        // Remove pesky table controls
@@ -1379 +1403 @@
-
-        h += '</tr></table>';
-
-h += '<a href="" class="mceMoreColors">More colors</a>';
-*/
+
+if (tinyMCE.getParam("theme_advanced_more_colors", true))
+   h += '<a href="#" onclick="TinyMCE_AdvancedTheme._pickColor(\'' + id + '\',\'' + cm + '\');" class="mceMoreColors">' + tinyMCE.getLang('lang_more_colors') + '</a>';
-
-        return h;
+    },
+
+    _pickColor : function(id, cm) {
+        var inputColor, inst = tinyMCE.selectedInstance;
+
+        if (cm == 'forecolor' && inst)
+            inputColor = inst.foreColor;
+
+        if ((cm == 'backcolor' || cm == 'HiliteColor') && inst)
+            inputColor = inst.backColor;
+
+        tinyMCE.execCommand('mceColorPicker', true, {color : inputColor, callback : function(c) {
+            tinyMCE.execInstanceCommand(id, cm, false, c);
+        }});
-    },
-

trunk/wp-includes/js/tinymce/themes/advanced/jscripts/color_picker.js

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-var colors = new Array(
@@ -46 +31 @@
-);
-
+var named = {
+    '#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+    '#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
+    '#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
+    '#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
+    '#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
+    '#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
+    '#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
+    '#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
+    '#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
+    '#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
+    '#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
+    '#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
+    '#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
+    '#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+    '#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
+    '#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
+    '#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
+    '#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
+    '#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
+    '#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
+    '#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
+    '#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+    '#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
+};
+
+function init() {
+    var inputColor = convertRGBToHex(tinyMCE.getWindowArg('input_color'));
+
+    if (tinyMCE.isMSIE)
+        tinyMCEPopup.resizeToInnerSize();
+
+    generatePicker();
+
+    if (inputColor) {
+        changeFinalColor(inputColor);
+
+        col = convertHexToRGB(inputColor);
+
+        if (col)
+            updateLight(col.r, col.g, col.b);
+    }
+}
+
+function insertAction() {
+    var color = document.getElementById("color").value;
+
+    tinyMCEPopup.execCommand(tinyMCE.getWindowArg('command'), false, color);
+    tinyMCEPopup.close();
+}
+
+function showColor(color, name) {
+    if (name)
+        document.getElementById("colorname").innerHTML = name;
+
+    document.getElementById("preview").style.backgroundColor = color;
+    document.getElementById("color").value = color;
+}
+
-function convertRGBToHex(col) {
-    var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+    if (!col)
+        return col;
-
-    var rgb = col.replace(re, "$1,$2,$3").split(',');
@@ -73 +120 @@
-        b = parseInt(col.substring(4, 6), 16);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        + '<tr>';
-
-
+
+
+
-            + '<a href="javascript:selectColor();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');">'
-            + '<img border="0" src="images/spacer.gif" width="10" height="10" title="' + colors[i] +  '" alt="' + colors[i] +  '" /></a></td>';
-        if ((i+1) % 18 == 0)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+