Merge remote branch 'upstream/master'

6 files changed, 41 insertions, 39 deletions

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
index ecdf58c7b..ecdf58c7b 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
index cd9c985b7..165bc12df 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js
@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){window.focus();a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index 1433a06a4..4c87e8fa7 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -12,6 +12,10 @@
 	tinymce.create('tinymce.plugins.SearchReplacePlugin', {

 		init : function(ed, url) {

 			function open(m) {

+				// Keep IE from writing out the f/r character to the editor

+				// instance while initializing a new dialog. See: #3131190

+				window.focus();

+

 				ed.windowManager.open({

 					file : url + '/searchreplace.htm',

 					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
index c0a624329..80284b9f3 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -2,14 +2,18 @@ tinyMCEPopup.requireLangPack();
 

 var SearchReplaceDialog = {

 	init : function(ed) {

-		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

+		var t = this, f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

 

-		this.switchMode(m);

+		t.switchMode(m);

 

 		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");

 

 		// Focus input field

 		f[m + '_panel_searchstring'].focus();

+		

+		mcTabs.onChange.add(function(tab_id, panel_id) {

+			t.switchMode(tab_id.substring(0, tab_id.indexOf('_')));

+		});

 	},

 

 	switchMode : function(m) {

@@ -42,21 +46,23 @@ var SearchReplaceDialog = {
 		ca = f[m + '_panel_casesensitivebox'].checked;

 		rs = f['replace_panel_replacestring'].value;

 

+		if (tinymce.isIE) {

+			r = ed.getDoc().selection.createRange();

+		}

+

 		if (s == '')

 			return;

 

 		function fix() {

 			// Correct Firefox graphics glitches

+			// TODO: Verify if this is actually needed any more, maybe it was for very old FF versions? 

 			r = se.getRng().cloneRange();

 			ed.getDoc().execCommand('SelectAll', false, null);

 			se.setRng(r);

 		};

 

 		function replace() {

-			if (tinymce.isIE)

-				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE

-			else

-				ed.getDoc().execCommand('InsertHTML', false, rs);

+			ed.selection.setContent(rs); // Needs to be duplicated due to selection bug in IE

 		};

 

 		// IE flags

@@ -70,6 +76,9 @@ var SearchReplaceDialog = {
 				ed.selection.collapse(true);

 

 				if (tinymce.isIE) {

+					ed.focus();

+					r = ed.getDoc().selection.createRange();

+

 					while (r.findText(s, b ? -1 : 1, fl)) {

 						r.scrollIntoView();

 						r.select();

@@ -111,6 +120,9 @@ var SearchReplaceDialog = {
 			return;

 

 		if (tinymce.isIE) {

+			ed.focus();

+			r = ed.getDoc().selection.createRange();

+

 			if (r.findText(s, b ? -1 : 1, fl)) {

 				r.scrollIntoView();

 				r.select();

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 370959afa..8a6590097 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1,16 +1 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{

-searchnext_desc:"Find again",

-notfound:"The search has been completed. The search string could not be found.",

-search_title:"Find",

-replace_title:"Find/Replace",

-allreplaced:"All occurrences of the search string were replaced.",

-findwhat:"Find what",

-replacewith:"Replace with",

-direction:"Direction",

-up:"Up",

-down:"Down",

-mcase:"Match case",

-findnext:"Find next",

-replace:"Replace",

-replaceall:"Replace all"

-});
\ No newline at end of file
+tinyMCE.addI18n('en.searchreplace_dlg',{findwhat:"Find What",replacewith:"Replace with",direction:"Direction",up:"Up",down:"Down",mcase:"Match Case",findnext:"Find Next",allreplaced:"All occurrences of the search string were replaced.","searchnext_desc":"Find Again",notfound:"The search has been completed. The search string could not be found.","search_title":"Find","replace_title":"Find/Replace",replaceall:"Replace All",replace:"Replace"});
\ No newline at end of file
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
index d0424cfc9..5a22d8aa4 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
+++ b/library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
@@ -8,27 +8,28 @@
 	<script type="text/javascript" src="js/searchreplace.js"></script>

 	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />

 </head>

-<body style="display:none;">

+<body style="display:none;" role="application" aria-labelledby="app_title">

+<span id="app_title" style="display:none">{#searchreplace_dlg.replace_title}</span>

 <form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">

 	<div class="tabs">

 		<ul>

-			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

-			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

+			<li id="search_tab" aria-controls="search_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

+			<li id="replace_tab" aria-controls="replace_panel"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

 		</ul>

 	</div>

 

 	<div class="panel_wrapper">

 		<div id="search_panel" class="panel">

-			<table border="0" cellspacing="0" cellpadding="2">

+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">

 				<tr>

 					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

-					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>

+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="search_panel_backwards_label">

+								<td><label id="search_panel_backwards_label">{#searchreplace_dlg.direction}</label></td>

 								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>

 								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

 								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>

@@ -39,7 +40,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0">

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 							<tr>

 								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

 								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

@@ -51,20 +52,20 @@
 		</div>

 

 		<div id="replace_panel" class="panel">

-			<table border="0" cellspacing="0" cellpadding="2">

+			<table role="presentation" border="0" cellspacing="0" cellpadding="2">

 				<tr>

 					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

-					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>

+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>

-					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>

+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" aria-required="true" /></td>

 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0" class="direction">

-							<tr>

-								<td><label>{#searchreplace_dlg.direction}</label></td>

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr role="group" aria-labelledby="replace_panel_dir_label">

+								<td><label id="replace_panel_dir_label">{#searchreplace_dlg.direction}</label></td>

 								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>

 								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

 								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>

@@ -75,7 +76,7 @@
 				</tr>

 				<tr>

 					<td colspan="2">

-						<table border="0" cellspacing="0" cellpadding="0">

+						<table role="presentation" border="0" cellspacing="0" cellpadding="0">

 							<tr>

 								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

 								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>