Imported Upstream version 0.2~stable

[roundcube.git] / program / js / tiny_mce / themes / advanced / editor_template_src.js

diff --git a/program/js/tiny_mce/themes/advanced/editor_template_src.js b/program/js/tiny_mce/themes/advanced/editor_template_src.js
index 381ba6ba72e05a1b836b2f80889077e05a148edb..757b633e1e9a492cf634295625e87d719eab810a 100644 (file)
--- a/program/js/tiny_mce/themes/advanced/editor_template_src.js
+++ b/program/js/tiny_mce/themes/advanced/editor_template_src.js
@@ -1,5 +1,5 @@
 /**\r
- * $Id: editor_template_src.js 766 2008-04-03 20:37:06Z spocke $\r
+ * $Id: editor_template_src.js 852 2008-05-27 05:52:09Z spocke $\r
  *\r
  * @author Moxiecode\r
  * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
@@ -158,7 +158,7 @@
                        return false;\r
                },\r
 \r
-               _importClasses : function() {\r
+               _importClasses : function(e) {\r
                        var ed = this.editor, c = ed.controlManager.get('styleselect');\r
 \r
                        if (c.getLength() == 0) {\r
@@ -188,8 +188,8 @@
                                });\r
 \r
                                c.onPostRender.add(function(ed, n) {\r
-                                       Event.add(n, 'focus', t._importClasses, t);\r
-                                       Event.add(n, 'mousedown', t._importClasses, t);\r
+                                       Event.add(n.id + '_text', 'focus', t._importClasses, t);\r
+                                       Event.add(n.id + '_text', 'mousedown', t._importClasses, t);\r
                                });\r
                        }\r
 \r
@@ -210,7 +210,7 @@
                },\r
 \r
                _createFontSizeSelect : function() {\r
-                       var c, t = this, lo = [\r
+                       var t = this, ed = t.editor, c, lo = [\r
                                "1 (8 pt)",\r
                                "2 (10 pt)",\r
                                "3 (12 pt)",\r
@@ -220,10 +220,10 @@
                                "7 (36 pt)"\r
                        ], fz = [8, 10, 12, 14, 18, 24, 36];\r
 \r
-                       c = t.editor.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});\r
+                       c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});\r
                        if (c) {\r
-                               each(explode(t.settings.theme_advanced_font_sizes), function(v) {\r
-                                       c.add(lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'mceFontSize' + v});\r
+                               each(ed.getParam('theme_advanced_font_sizes', t.settings.theme_advanced_font_sizes, 'hash'), function(v, k) {\r
+                                       c.add(k != v ? k : lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'mceFontSize' + v});\r
                                });\r
                        }\r
 \r
@@ -519,7 +519,7 @@
                        each(explode(s.theme_advanced_containers || ''), function(c, i) {\r
                                var v = s['theme_advanced_container_' + c] || '';\r
 \r
-                               switch (c.toLowerCase()) {\r
+                               switch (v.toLowerCase()) {\r
                                        case 'mceeditor':\r
                                                n = DOM.add(tb, 'tr');\r
                                                n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});\r
@@ -530,7 +530,7 @@
                                                break;\r
 \r
                                        default:\r
-                                               a = s['theme_advanced_container_' + c + '_align'].toLowerCase();\r
+                                               a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();\r
                                                a = 'mce' + t._ufirst(a);\r
 \r
                                                n = DOM.add(DOM.add(tb, 'tr'), 'td', {\r
@@ -797,7 +797,7 @@
                                c.select(ed.queryCommandValue('FontName'));\r
 \r
                        if (c = cm.get('fontsizeselect'))\r
-                               c.select(ed.queryCommandValue('FontSize'));\r
+                               c.select('' + ed.queryCommandValue('FontSize'));\r
 \r
                        if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {\r
                                p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});\r
@@ -1023,7 +1023,9 @@
                        var t = this;\r
 \r
                        this._mceColorPicker(0, {\r
+                               color: t.fgColor,\r
                                func : function(co) {\r
+                                       t.fgColor = co;\r
                                        t.editor.execCommand('ForeColor', false, co);\r
                                }\r
                        });\r
@@ -1033,7 +1035,9 @@
                        var t = this;\r
 \r
                        this._mceColorPicker(0, {\r
+                               color: t.bgColor,\r
                                func : function(co) {\r
+                                       t.bgColor = co;\r
                                        t.editor.execCommand('HiliteColor', false, co);\r
                                }\r
                        });\r