From f5e8d23e8e7e69a6c2032e2878aa37da65af3455 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 05 Apr 2008 03:26:59 -0400
Subject: [PATCH] #1484962: typo
---
program/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js | 140 +++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 76 deletions(-)
diff --git a/program/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/program/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index eed96db..cd2f3a8 100644
--- a/program/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -1,60 +1,61 @@
/**
- * $RCSfile: editor_plugin_src.js,v $
- * $Revision: 1.27 $
- * $Date: 2006/02/13 15:09:28 $
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
*
* @author Moxiecode
- * @copyright Copyright � 2004-2006, Moxiecode Systems AB, All rights reserved.
+ * @copyright Copyright � 2004-2007, Moxiecode Systems AB, All rights reserved.
*/
-/* Import theme specific language pack */
-tinyMCE.importPluginLanguagePack('searchreplace', 'en,tr,sv,zh_cn,fa,fr_ca,fr,de,pl,pt_br,cs,nl,da,he,nb,hu,ru,ru_KOI8-R,ru_UTF-8,nn,fi,cy,es,is,zh_tw,zh_tw_utf8,sk');
+tinyMCE.importPluginLanguagePack('searchreplace');
var TinyMCE_SearchReplacePlugin = {
getInfo : function() {
return {
longname : 'Search/Replace',
- author : 'Moxiecode Systems',
+ author : 'Moxiecode Systems AB',
authorurl : 'http://tinymce.moxiecode.com',
- infourl : 'http://tinymce.moxiecode.com/tinymce/docs/plugin_searchreplace.html',
+ infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
};
},
- initInstance : function(inst) {
+ initInstance : function (inst) {
inst.addShortcut('ctrl', 'f', 'lang_searchreplace_search_desc', 'mceSearch', true);
+ // No CTRL+R for "replace" because browsers will reload page instead of executing plugin
},
- getControlHTML : function(cn) {
+ getControlHTML : function (cn) {
switch (cn) {
- case "search":
- return tinyMCE.getButtonHTML(cn, 'lang_searchreplace_search_desc', '{$pluginurl}/images/search.gif', 'mceSearch', true);
- case "replace":
+ case "search" :
+ return tinyMCE.getButtonHTML(cn, 'lang_searchreplace_search_desc', '{$pluginurl}/images/search.gif','mceSearch', true);
+
+ case "replace" :
return tinyMCE.getButtonHTML(cn, 'lang_searchreplace_replace_desc', '{$pluginurl}/images/replace.gif', 'mceSearchReplace', true);
}
+
return "";
},
- /**
- * Executes the search/replace commands.
- */
- execCommand : function(editor_id, element, command, user_interface, value) {
- var instance = tinyMCE.getInstanceById(editor_id);
+ execCommand : function (editor_id, element, command, user_interface, value) {
+ var inst = tinyMCE.getInstanceById(editor_id), selectedText = inst.selection.getSelectedText(), rng;
function defValue(key, default_value) {
value[key] = typeof(value[key]) == "undefined" ? default_value : value[key];
}
function replaceSel(search_str, str, back) {
- instance.execCommand('mceInsertContent', false, str);
+ if (!inst.selection.isCollapsed()) {
+ if (tinyMCE.isRealIE)
+ inst.selection.getRng().duplicate().pasteHTML(str); // Needs to be duplicated due to selection bug in IE
+ else
+ inst.execCommand('mceInsertContent', false, str);
+ }
}
if (!value)
- value = new Array();
+ value = [];
- // Setup defualt values
defValue("editor_id", editor_id);
- defValue("searchstring", "");
+ defValue("searchstring", selectedText);
defValue("replacestring", null);
defValue("replacemode", "none");
defValue("casesensitive", false);
@@ -62,68 +63,45 @@
defValue("wrap", false);
defValue("wholeword", false);
defValue("inline", "yes");
+ defValue("resizable", "no");
- // Handle commands
switch (command) {
- case "mceResetSearch":
- tinyMCE.lastSearchRng = null;
- return true;
-
- case "mceSearch":
+ case "mceSearch" :
if (user_interface) {
- // Open search dialog
var template = new Array();
- if (value['replacestring'] != null) {
- template['file'] = '../../plugins/searchreplace/replace.htm'; // Relative to theme
- template['width'] = 320;
- template['height'] = 100 + (tinyMCE.isNS7 ? 20 : 0);
- template['width'] += tinyMCE.getLang('lang_searchreplace_replace_delta_width', 0);
- template['height'] += tinyMCE.getLang('lang_searchreplace_replace_delta_height', 0);
- } else {
- template['file'] = '../../plugins/searchreplace/search.htm'; // Relative to theme
- template['width'] = 310;
- template['height'] = 105 + (tinyMCE.isNS7 ? 25 : 0);
- template['width'] += tinyMCE.getLang('lang_searchreplace_search_delta_width', 0);
- template['height'] += tinyMCE.getLang('lang_searchreplace_replace_delta_height', 0);
- }
+ template['file'] = '../../plugins/searchreplace/searchreplace.htm';
+ template['width'] = 380;
+ template['height'] = 155 + (tinyMCE.isNS7 ? 20 : 0) + (tinyMCE.isMSIE ? 15 : 0);
+ template['width'] += tinyMCE.getLang('lang_searchreplace_delta_width', 0);
+ template['height'] += tinyMCE.getLang('lang_searchreplace_delta_height', 0);
- instance.execCommand('SelectAll');
-
- if (tinyMCE.isMSIE) {
- var r = instance.selection.getRng();
- r.collapse(true);
- r.select();
- } else
- instance.selection.getSel().collapseToStart();
+ inst.selection.collapse(true);
tinyMCE.openWindow(template, value);
} else {
var win = tinyMCE.getInstanceById(editor_id).contentWindow;
var doc = tinyMCE.getInstanceById(editor_id).contentWindow.document;
var body = tinyMCE.getInstanceById(editor_id).contentWindow.document.body;
+ var awin = value.win, found;
- // Whats the point
if (body.innerHTML == "") {
- alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+ awin.alert(tinyMCE.getLang('lang_searchreplace_notfound'));
return true;
}
- // Handle replace current
if (value['replacemode'] == "current") {
replaceSel(value['string'], value['replacestring'], value['backwards']);
-
- // Search next one
value['replacemode'] = "none";
- tinyMCE.execInstanceCommand(editor_id, 'mceSearch', user_interface, value, false);
-
- return true;
+ //tinyMCE.execInstanceCommand(editor_id, 'mceSearch', user_interface, value);
+ //return true;
}
- if (tinyMCE.isMSIE) {
- var rng = tinyMCE.lastSearchRng ? tinyMCE.lastSearchRng : doc.selection.createRange();
- var flags = 0;
+ inst.selection.collapse(value['backwards']);
+ if (tinyMCE.isMSIE) {
+ var rng = inst.selection.getRng();
+ var flags = 0;
if (value['wholeword'])
flags = flags | 2;
@@ -131,55 +109,65 @@
flags = flags | 4;
if (!rng.findText) {
- alert('This operation is currently not supported by this browser.');
+ awin.alert('This operation is currently not supported by this browser.');
return true;
}
- // Handle replace all mode
if (value['replacemode'] == "all") {
+ found = false;
+
while (rng.findText(value['string'], value['backwards'] ? -1 : 1, flags)) {
+ found = true;
rng.scrollIntoView();
rng.select();
- rng.collapse(false);
replaceSel(value['string'], value['replacestring'], value['backwards']);
}
- alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+ if (found)
+ awin.alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+ else
+ awin.alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+
return true;
}
if (rng.findText(value['string'], value['backwards'] ? -1 : 1, flags)) {
rng.scrollIntoView();
rng.select();
- rng.collapse(value['backwards']);
- tinyMCE.lastSearchRng = rng;
} else
- alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+ awin.alert(tinyMCE.getLang('lang_searchreplace_notfound'));
} else {
if (value['replacemode'] == "all") {
- while (win.find(value['string'], value['casesensitive'], value['backwards'], value['wrap'], value['wholeword'], false, false))
- replaceSel(value['string'], value['replacestring'], value['backwards']);
+ found = false;
- alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+ while (win.find(value['string'], value['casesensitive'], value['backwards'], value['wrap'], value['wholeword'], false, false)) {
+ found = true;
+ replaceSel(value['string'], value['replacestring'], value['backwards']);
+ }
+
+ if (found)
+ awin.alert(tinyMCE.getLang('lang_searchreplace_allreplaced'));
+ else
+ awin.alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+
return true;
}
if (!win.find(value['string'], value['casesensitive'], value['backwards'], value['wrap'], value['wholeword'], false, false))
- alert(tinyMCE.getLang('lang_searchreplace_notfound'));
+ awin.alert(tinyMCE.getLang('lang_searchreplace_notfound'));
}
}
+
return true;
- case "mceSearchReplace":
+ case "mceSearchReplace" :
value['replacestring'] = "";
-
tinyMCE.execInstanceCommand(editor_id, 'mceSearch', user_interface, value, false);
return true;
}
- // Pass to next handler in chain
return false;
}
};
-tinyMCE.addPlugin("searchreplace", TinyMCE_SearchReplacePlugin);
+tinyMCE.addPlugin("searchreplace", TinyMCE_SearchReplacePlugin);
\ No newline at end of file
--
Gitblit v1.9.1