upgrade TinyMCE to 3.4.x

[quix0rs-gnu-social.git] / plugins / TinyMCE / js / plugins / advlist / editor_plugin_src.js

diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
index a61887a9220678c7f62f630a47a16abbf2dd80a4..13ef02ddd5f98d80ca5c1cbe189b52abe0ca282e 100644 (file)
--- a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
@@ -35,6 +35,9 @@
                        // Setup number formats from config or default\r
                        t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");\r
                        t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");\r
+\r
+                       if (tinymce.isIE && /MSIE [2-7]/.test(navigator.userAgent))\r
+                               t.isIE7 = true;\r
                },\r
 \r
                createControl: function(name, cm) {\r
@@ -72,12 +75,12 @@
                                        // Append styles to new list element\r
                                        if (format) {\r
                                                list = dom.getParent(sel.getNode(), 'ol,ul');\r
-\r
                                                if (list) {\r
                                                        dom.setStyles(list, format.styles);\r
-                                                       list.removeAttribute('_mce_style');\r
+                                                       list.removeAttribute('data-mce-style');\r
                                                }\r
                                        }\r
+                                       ed.focus();\r
                                };\r
 \r
                                btn = cm.createSplitButton(name, {\r
@@ -122,9 +125,13 @@
                                                }\r
                                        });\r
 \r
-                                       menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1);\r
+                                       menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle', titleItem: true}).setDisabled(1);\r
 \r
                                        each(t[name], function(item) {\r
+                                               // IE<8 doesn't support lower-greek, skip it\r
+                                               if (t.isIE7 && item.styles.listStyleType == 'lower-greek')\r
+                                                       return;\r
+\r
                                                item.id = t.editor.dom.uniqueId();\r
 \r
                                                menu.add({id : item.id, title : item.title, onclick : function() {\r