Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / plugins / searchreplace / js / searchreplace.js

diff --git a/webcit/tiny_mce/plugins/searchreplace/js/searchreplace.js b/webcit/tiny_mce/plugins/searchreplace/js/searchreplace.js
index 0137ba0fdd1fce5cfdcecd11c5a6ba8159e8c742..80284b9f3ff0b33d7348de16cbdf0a162bb89419 100644 (file)
--- a/webcit/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/webcit/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
 \r
 var SearchReplaceDialog = {\r
        init : function(ed) {\r
-               var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");\r
+               var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");\r
 \r
-               this.switchMode(m);\r
+               t.switchMode(m);\r
 \r
                f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");\r
 \r
                // Focus input field\r
                f[m + '_panel_searchstring'].focus();\r
+               \r
+               mcTabs.onChange.add(function(tab_id, panel_id) {\r
+                       t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));\r
+               });\r
        },\r
 \r
        switchMode : function(m) {\r
@@ -51,16 +55,14 @@ var SearchReplaceDialog = {
 \r
                function fix() {\r
                        // Correct Firefox graphics glitches\r
+                       // TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? \r
                        r = se.getRng().cloneRange();\r
                        ed.getDoc().execCommand('SelectAll', false, null);\r
                        se.setRng(r);\r
                };\r
 \r
                function replace() {\r
-                       if (tinymce.isIE)\r
-                               ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE\r
-                       else\r
-                               ed.getDoc().execCommand('InsertHTML', false, rs);\r
+                       ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE\r
                };\r
 \r
                // IE flags\r
@@ -74,6 +76,9 @@ var SearchReplaceDialog = {
                                ed.selection.collapse(true);\r
 \r
                                if (tinymce.isIE) {\r
+                                       ed.focus();\r
+                                       r = ed.getDoc().selection.createRange();\r
+\r
                                        while (r.findText(s, b ? -1 : 1, fl)) {\r
                                                r.scrollIntoView();\r
                                                r.select();\r
@@ -110,15 +115,14 @@ var SearchReplaceDialog = {
                se.collapse(b);\r
                r = se.getRng();\r
 \r
-               if (tinymce.isIE) {\r
-                       r = ed.getDoc().selection.createRange();\r
-               }\r
-\r
                // Whats the point\r
                if (!s)\r
                        return;\r
 \r
                if (tinymce.isIE) {\r
+                       ed.focus();\r
+                       r = ed.getDoc().selection.createRange();\r
+\r
                        if (r.findText(s, b ? -1 : 1, fl)) {\r
                                r.scrollIntoView();\r
                                r.select();\r