reverting tinymce changes, updating smarty to 3.1.19

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

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
index 370b082814e092bd4b8bdf74d3dbb0ddc4f305d4..0154eceb58c0f87f00cd5e613c3d8de2e14f62a1 100644 (file)
--- a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -291,7 +291,7 @@
                                }\r
                        }\r
 \r
-                       // Check if we should use the new auto process method\r
+                       // Check if we should use the new auto process method                   \r
                        if (getParam(ed, "paste_auto_cleanup_on_paste")) {\r
                                // Is it's Opera or older FF use key handler\r
                                if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {\r
@@ -354,7 +354,7 @@
                                                h = h.replace(v[0], v[1]);\r
                                });\r
                        }\r
-\r
+                       \r
                        if (ed.settings.paste_enable_default_filters == false) {\r
                                return;\r
                        }\r
@@ -413,9 +413,7 @@
                                // If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot.\r
                                do {\r
                                        len = h.length;\r
-                                       // Don't remove the type attribute for lists so that non-default list types display correctly.\r
-                                       h = h.replace(/(<?!(ol|ul)[^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");\r
-                                       h = h.replace(/(<(ol|ul)[^>]*\s)(?:id|name|language|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");\r
+                                       h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");\r
                                } while (len != h.length);\r
 \r
                                // Remove all spans if no styles is to be retained\r
@@ -591,7 +589,7 @@
                        if (ed.settings.paste_enable_default_filters == false) {\r
                                return;\r
                        }\r
-\r
+                       \r
                        if (o.wordContent) {\r
                                // Remove named anchors or TOC links\r
                                each(dom.select('a', o.node), function(a) {\r
@@ -719,7 +717,7 @@
                                        if (type == 'ul')\r
                                                html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o\u25CF]\s*(&nbsp;|\u00a0)+\s*/, '');\r
                                        else\r
-                                               html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*[\w|'<'|'>']+\.(&nbsp;|\u00a0)+\s*/, '');;\r
+                                               html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');\r
 \r
                                        // Create li and add paragraph data into the new li\r
                                        li = listElm.appendChild(dom.create('li', 0, html));\r