Updated tiny-mce to most recent 3.4 version

[citadel.git] / webcit / tiny_mce / plugins / paste / editor_plugin_src.js

diff --git a/webcit/tiny_mce/plugins/paste/editor_plugin_src.js b/webcit/tiny_mce/plugins/paste/editor_plugin_src.js
index 1d9d3b42e7ca3070541f01a117d15141c86afcda..73fe7fe9a40abe31e9ec11bcc61525ddf144735a 100644 (file)
--- a/webcit/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -27,7 +27,7 @@
                        paste_text_sticky : false,\r
                        paste_text_sticky_default : false,\r
                        paste_text_notifyalways : false,\r
-                       paste_text_linebreaktype : "p",\r
+                       paste_text_linebreaktype : "combined",\r
                        paste_text_replacements : [\r
                                [/\u2026/g, "..."],\r
                                [/[\x93\x94\u201c\u201d]/g, '"'],\r
@@ -805,14 +805,24 @@
 \r
                                // Treat paragraphs as specified in the config\r
                                if (linebr == "none") {\r
+                                       // Convert all line breaks to space\r
                                        process([\r
                                                [/\n+/g, " "]\r
                                        ]);\r
                                } else if (linebr == "br") {\r
+                                       // Convert all line breaks to <br />\r
                                        process([\r
                                                [/\n/g, "<br />"]\r
                                        ]);\r
+                               } else if (linebr == "p") {\r
+                                       // Convert all line breaks to <p>...</p>\r
+                                       process([\r
+                                               [/\n+/g, "</p><p>"],\r
+                                               [/^(.*<\/p>)(<p>)$/, '<p>$1']\r
+                                       ]);\r
                                } else {\r
+                                       // defaults to "combined"\r
+                                       // Convert single line breaks to <br /> and double line breaks to <p>...</p>\r
                                        process([\r
                                                [/\n\n/g, "</p><p>"],\r
                                                [/^(.*<\/p>)(<p>)$/, '<p>$1'],\r