TinyMCE 3.5.8 update; some fixes

[friendica.git] / library / tinymce / jscripts / tiny_mce / plugins / table / js / table.js

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
index 0aafb5fda091449c1e96afacda45df8e269590ca..1db243b63a69a7c4d442703c08bd673efe85e62b 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
@@ -247,7 +247,10 @@ function insertTable() {
 
                // Fixes a bug in IE where the caret cannot be placed after the table if the table is at the end of the document\r
                if (tinymce.isIE && node.nextSibling == null) {\r
-                       dom.insertAfter(dom.create('p'), node);\r
+                       if (inst.settings.forced_root_block)\r
+                               dom.insertAfter(dom.create(inst.settings.forced_root_block), node);\r
+                       else\r
+                               dom.insertAfter(dom.create('br', {'data-mce-bogus': '1'}), node);\r
                }
 \r
                try {\r
@@ -304,6 +307,15 @@ function init() {
        var formObj = document.forms[0];\r
        var elm = dom.getParent(inst.selection.getNode(), "table");\r
 \r
+       // Hide advanced fields that isn't available in the schema\r
+       tinymce.each("summary id rules dir style frame".split(" "), function(name) {\r
+               var tr = tinyMCEPopup.dom.getParent(name, "tr") || tinyMCEPopup.dom.getParent("t" + name, "tr");\r
+\r
+               if (tr && !tinyMCEPopup.editor.schema.isValid("table", name)) {\r
+                       tr.style.display = 'none';\r
+               }\r
+       });\r
+\r
        action = tinyMCEPopup.getWindowArg('action');\r
 \r
        if (!action)\r