Imported Upstream version 0.3

[roundcube.git] / program / js / tiny_mce / plugins / table / editor_plugin_src.js

diff --git a/program/js/tiny_mce/plugins/table/editor_plugin_src.js b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
index 24635826f57169bc6c8eea21db6b2759946d0b1b..80cf748a305b86bd6bff86a75a006ed0f048286f 100644 (file)
--- a/program/js/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,5 +1,5 @@
 /**\r
- * $Id: editor_plugin_src.js 853 2008-05-27 08:05:35Z spocke $\r
+ * $Id: editor_plugin_src.js 953 2008-11-04 10:16:50Z spocke $\r
  *\r
  * @author Moxiecode\r
  * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
@@ -33,6 +33,27 @@
                                ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});\r
                        });\r
 \r
+                       if (ed.getParam('inline_styles')) {\r
+                               // Force move of attribs to styles in strict mode\r
+                               ed.onPreProcess.add(function(ed, o) {\r
+                                       var dom = ed.dom;\r
+\r
+                                       each(dom.select('table', o.node), function(n) {\r
+                                               var v;\r
+\r
+                                               if (v = dom.getAttrib(n, 'width')) {\r
+                                                       dom.setStyle(n, 'width', v);\r
+                                                       dom.setAttrib(n, 'width');\r
+                                               }\r
+\r
+                                               if (v = dom.getAttrib(n, 'height')) {\r
+                                                       dom.setStyle(n, 'height', v);\r
+                                                       dom.setAttrib(n, 'height');\r
+                                               }\r
+                                       });\r
+                               });\r
+                       }\r
+\r
                        ed.onInit.add(function() {\r
                                if (ed && ed.plugins.contextmenu) {\r
                                        ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {\r
@@ -728,7 +749,7 @@
                                                                if (!trElm || !tdElm)\r
                                                                        return true;\r
 \r
-                                                               var grid = getTableGrid(tableElm);\r
+                                                               var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));\r
                                                                var cpos = getCellPos(grid, tdElm);\r
                                                                var lastTDElm = null;\r
 \r
@@ -759,7 +780,7 @@
                                                                if (!trElm || !tdElm)\r
                                                                        return true;\r
 \r
-                                                               var grid = getTableGrid(tableElm);\r
+                                                               var grid = getTableGrid(inst.dom.getParent(tableElm, "table"));\r
                                                                var cpos = getCellPos(grid, tdElm);\r
                                                                var lastTDElm = null;\r
 \r