RubyGems - typo - Versions diffs - 5.0.3.98.1 → 5.1 - Mend

typo 5.0.3.98.1 → 5.1

Files changed (453) hide show

data/public/javascripts/fckeditor/editor/dialog/fck_listprop.html CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -29,13 +29,14 @@
 	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 	<script type="text/javascript">
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
 // Gets the document DOM
 var oDOM = oEditor.FCK.EditorDocument ;
 var sListType = ( location.search == '?OL' ? 'OL' : 'UL' ) ;
-var oActiveEl = oEditor.FCKSelection.MoveToAncestorNode( sListType ) ;
+var oActiveEl = dialog.Selection.GetSelection().MoveToAncestorNode( sListType ) ;
 var oActiveSel ;
 window.onload = function()
@@ -63,7 +64,10 @@ window.onload = function()
 			oActiveSel.value = oActiveEl.getAttribute('type') ;
 	}
-	window.parent.SetOkButton( true ) ;
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtStartPosition' ) ;
 }
 function Ok()

data/public/javascripts/fckeditor/editor/dialog/fck_paste.html CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -28,41 +28,61 @@
 	<title></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex, nofollow" />
+	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 	<script type="text/javascript">
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
 var FCK = oEditor.FCK;
 var FCKTools	= oEditor.FCKTools ;
 var FCKConfig	= oEditor.FCKConfig ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
 window.onload = function ()
 {
 	// First of all, translate the dialog box texts
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-	var sPastingType = window.parent.dialogArguments.CustomValue ;
+	var sPastingType = dialog.Args().CustomValue ;
 	if ( sPastingType == 'Word' || sPastingType == 'Security' )
 	{
 		if ( sPastingType == 'Security' )
 			document.getElementById( 'xSecurityMsg' ).style.display = '' ;
-		var oFrame = document.getElementById('frmData') ;
-		oFrame.style.display = '' ;
-		// Avoid errors if the pasted content has any script that fails: #389
-		var oDoc = oFrame.contentWindow.document ;
-		oDoc.open() ;
-		oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
-		oDoc.close() ;
-		if ( oFrame.contentDocument )
-			oFrame.contentDocument.designMode = 'on' ;
-		else
-			oFrame.contentWindow.document.body.contentEditable = true ;
+		// For document.domain compatibility (#123) we must do all the magic in
+		// the URL for IE.
+		var sFrameUrl = !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE ?
+			'javascript:void(0)' :
+			'javascript:void( (function(){' +
+				'document.open() ;' +
+				'document.domain=\'' + document.domain + '\' ;' +
+				'document.write(\'<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>\') ;' +
+				'document.close() ;' +
+				'document.body.contentEditable = true ;' +
+				'window.focus() ;' +
+				'})() )' ;
+		var eFrameSpace = document.getElementById( 'xFrameSpace' ) ;
+		eFrameSpace.innerHTML = '<iframe id="frmData" src="' + sFrameUrl + '" ' +
+					'height="98%" width="99%" frameborder="0" style="border: #000000 1px; background-color: #ffffff"></iframe>' ;
+		var oFrame = eFrameSpace.firstChild ;
+		if ( !oEditor.FCK_IS_CUSTOM_DOMAIN || !FCKBrowserInfo.IsIE )
+		{
+			// Avoid errors if the pasted content has any script that fails: #389
+			var oDoc = oFrame.contentWindow.document ;
+			oDoc.open() ;
+			oDoc.write('<html><head><script>window.onerror = function() { return true ; };<\/script><\/head><body><\/body><\/html>') ;
+			oDoc.close() ;
+			if ( FCKBrowserInfo.IsIE )
+				oDoc.body.contentEditable = true ;
+			else
+				oDoc.designMode = 'on' ;
-		// Set the focus on the pasting area
-		oFrame.contentWindow.focus();
+			oFrame.contentWindow.focus();
+		}
 	}
 	else
 	{
@@ -72,8 +92,8 @@ window.onload = function ()
 	if ( sPastingType != 'Word' )
 		document.getElementById('oWordCommands').style.display = 'none' ;
-	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
 }
 function Ok()
@@ -83,7 +103,7 @@ function Ok()
 	var sHtml ;
-	var sPastingType = window.parent.dialogArguments.CustomValue ;
+	var sPastingType = dialog.Args().CustomValue ;
 	if ( sPastingType == 'Word' || sPastingType == 'Security' )
 	{
@@ -119,6 +139,7 @@ function Ok()
 		// Use the marker method instead. It's primitive, but it works.
 		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
 		var oDoc = oEditor.FCK.EditorDocument ;
+		dialog.Selection.EnsureSelection() ;
 		range.MoveToSelection() ;
 		range.DeleteContents() ;
 		var marker = [] ;
@@ -157,17 +178,6 @@ function Ok()
 	return true ;
 }
-function CleanUpBox()
-{
-	var oFrame = document.getElementById('frmData') ;
-	if ( oFrame.contentDocument )
-		oFrame.contentDocument.body.innerHTML = '' ;
-	else
-		oFrame.contentWindow.document.body.innerHTML = '' ;
-}
 // This function will be called from the PasteFromWord dialog (fck_paste.html)
 // Input: oNode a DOM node that contains the raw paste from the clipboard
 // bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog
@@ -306,33 +316,22 @@ function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
 			</td>
 		</tr>
 		<tr>
-			<td valign="top" height="100%" style="border-right: #000000 1px solid; border-top: #000000 1px solid;
-				border-left: #000000 1px solid; border-bottom: #000000 1px solid">
+			<td id="xFrameSpace" valign="top" height="100%" style="border: #000000 1px solid">
 				<textarea id="txtData" cols="80" rows="5" style="border: #000000 1px; display: none;
 					width: 99%; height: 98%"></textarea>
-				<iframe id="frmData" src="javascript:void(0)" height="98%" width="99%" frameborder="0"
-					style="border-right: #000000 1px; border-top: #000000 1px; display: none; border-left: #000000 1px;
-					border-bottom: #000000 1px; background-color: #ffffff"></iframe>
 			</td>
 		</tr>
 		<tr id="oWordCommands">
 			<td>
-				<table border="0" cellpadding="0" cellspacing="0" width="100%">
-					<tr>
-						<td nowrap="nowrap">
-							<input id="chkRemoveFont" type="checkbox" checked="checked" />
-							<label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
-								Ignore Font Face definitions</label>
-							<br />
-							<input id="chkRemoveStyles" type="checkbox" />
-							<label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
-								Remove Styles definitions</label>
-						</td>
-						<td align="right" valign="top">
-							<input type="button" fcklang="DlgPasteCleanBox" value="Clean Up Box" onclick="CleanUpBox()" />
-						</td>
-					</tr>
-				</table>
+					<input id="chkRemoveFont" type="checkbox" checked="checked" />
+					<label for="chkRemoveFont" fcklang="DlgPasteIgnoreFont">
+						Ignore Font Face definitions</label>
+					<br />
+					<input id="chkRemoveStyles" type="checkbox" />
+					<label for="chkRemoveStyles" fcklang="DlgPasteRemoveStyles">
+						Remove Styles definitions</label>
 			</td>
 		</tr>
 	</table>

data/public/javascripts/fckeditor/editor/dialog/fck_radiobutton.html CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -29,12 +29,13 @@
 		<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 		<script type="text/javascript">
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
 // Gets the document DOM
 var oDOM = oEditor.FCK.EditorDocument ;
-var oActiveEl = oEditor.FCKSelection.GetSelectedElement() ;
+var oActiveEl = dialog.Selection.GetSelectedElement() ;
 window.onload = function()
 {
@@ -50,22 +51,16 @@ window.onload = function()
 	else
 		oActiveEl = null ;
-	window.parent.SetOkButton( true ) ;
+	dialog.SetOkButton( true ) ;
+	dialog.SetAutoSize( true ) ;
+	SelectField( 'txtName' ) ;
 }
 function Ok()
 {
 	oEditor.FCKUndo.SaveUndoStep() ;
-	if ( !oActiveEl )
-	{
-		oActiveEl = oEditor.FCK.EditorDocument.createElement( 'INPUT' ) ;
-		oActiveEl.type = 'radio' ;
-		oActiveEl = oEditor.FCK.InsertElement( oActiveEl ) ;
-	}
-	if ( GetE('txtName').value.length > 0 )
-		oActiveEl.name = GetE('txtName').value ;
+	oActiveEl = CreateNamedElement( oEditor, oActiveEl, 'INPUT', {name: GetE('txtName').value, type: 'radio' } ) ;
 	if ( oEditor.FCKBrowserInfo.IsIE )
 		oActiveEl.value = GetE('txtValue').value ;

data/public/javascripts/fckeditor/editor/dialog/fck_replace.html CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -29,11 +29,14 @@
 	<script src="common/fck_dialog_common.js" type="text/javascript"></script>
 	<script type="text/javascript">
-var oEditor = window.parent.InnerDialogLoaded() ;
+var dialog	= window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var dialogArguments = dialog.Args() ;
 var FCKLang = oEditor.FCKLang ;
-window.parent.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
-window.parent.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
+dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ;
+dialog.AddTab( 'Replace', FCKLang.DlgReplaceTitle ) ;
 var idMap = {} ;
 function OnDialogTabChange( tabCode )
@@ -43,6 +46,41 @@ function OnDialogTabChange( tabCode )
 	idMap['FindText'] = 'txtFind' + tabCode ;
 	idMap['CheckCase'] = 'chkCase' + tabCode ;
 	idMap['CheckWord'] = 'chkWord' + tabCode ;
+	if ( tabCode == 'Replace' )
+		dialog.SetAutoSize( true ) ;
+}
+// Place a range at the start of document.
+// This will be the starting point of our search.
+var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+function ResetGlobalRange()
+{
+	GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
+	GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
+	GlobalRange.Collapse( true ) ;
+}
+ResetGlobalRange() ;
+var HighlightRange = null ;
+function Highlight()
+{
+	if ( HighlightRange )
+		ClearHighlight() ;
+	var cloneRange = GlobalRange.Clone() ;
+	oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ;
+	HighlightRange = cloneRange ;
+	GlobalRange = HighlightRange.Clone() ;
+}
+function ClearHighlight()
+{
+	if ( HighlightRange )
+	{
+		oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ;
+		HighlightRange = null ;
+	}
 }
 function OnLoad()
@@ -50,76 +88,93 @@ function OnLoad()
 	// First of all, translate the dialog box texts.
 	oEditor.FCKLanguageManager.TranslatePage( document ) ;
-	// Place the cursor at the start of document.
-	// This will be the starting point of our search.
-	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-	range.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ;
-	range.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ;
-	range.Collapse( true ) ;
-	range.Select() ;
 	// Show the appropriate tab at startup.
-	if ( window.parent.name.search( 'Replace' ) == -1 )
-		window.parent.SetSelectedTab( 'Find' ) ;
+	if ( dialogArguments.CustomValue == 'Find' )
+	{
+		dialog.SetSelectedTab( 'Find' ) ;
+		dialog.SetAutoSize( true ) ;
+	}
 	else
-		window.parent.SetSelectedTab( 'Replace' ) ;
+		dialog.SetSelectedTab( 'Replace' ) ;
+	SelectField( 'txtFind' + dialogArguments.CustomValue ) ;
 }
-function btnStat(frm)
+function btnStat()
 {
-	document.getElementById('btnReplace').disabled =
-		document.getElementById('btnReplaceAll').disabled =
-			document.getElementById('btnFind').disabled =
-				( document.getElementById(idMap["FindText"]).value.length == 0 ) ;
+	GetE('btnReplace').disabled =
+		GetE('btnReplaceAll').disabled =
+			GetE('btnFind').disabled =
+				( GetE(idMap["FindText"]).value.length == 0 ) ;
 }
-function GetSelection()
+function btnStatDelayed()
 {
-	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-	range.MoveToSelection() ;
-	return range.CreateBookmark2() ;
+	setTimeout( btnStat, 1 ) ;
 }
 function GetSearchString()
 {
-	return document.getElementById(idMap['FindText']).value ;
+	return GetE(idMap['FindText']).value ;
 }
 function GetReplaceString()
 {
-	return document.getElementById("txtReplace").value ;
+	return GetE("txtReplace").value ;
 }
 function GetCheckCase()
 {
-	return !! ( document.getElementById(idMap['CheckCase']).checked ) ;
+	return !! ( GetE(idMap['CheckCase']).checked ) ;
 }
 function GetMatchWord()
 {
-	return !! ( document.getElementById(idMap['CheckWord']).checked ) ;
+	return !! ( GetE(idMap['CheckWord']).checked ) ;
 }
 // Get the data pointed to by a bookmark.
 function GetData( bookmark )
 {
-	var currentNode = oEditor.FCK.EditorDocument.documentElement;
-	for( var i = 0 ; i < bookmark.length ; i++ )
+	var cursor = oEditor.FCK.EditorDocument.documentElement ;
+	for ( var i = 0 ; i < bookmark.length ; i++ )
 	{
-		if ( currentNode.childNodes.length > bookmark[i] )
-			currentNode = currentNode.childNodes.item( bookmark[i] ) ;
-		else if ( currentNode.nodeType == 3 )	// text node
+		var target = bookmark[i] ;
+		var currentIndex = -1 ;
+		if ( cursor.nodeType != 3 )
 		{
-			var c = currentNode.nodeValue.charAt( bookmark[i] ) ;
-			if ( i == bookmark.length - 1 )
-				return c != "" ? c : null ;
-			else
+			for (var j = 0 ; j < cursor.childNodes.length ; j++ )
+			{
+				var candidate = cursor.childNodes[j] ;
+				if ( candidate.nodeType == 3 &&
+						candidate.previousSibling &&
+						candidate.previousSibling.nodeType == 3 )
+					continue ;
+				currentIndex++ ;
+				if ( currentIndex == target )
+				{
+					cursor = candidate ;
+					break ;
+				}
+			}
+			if ( currentIndex < target )
 				return null ;
 		}
 		else
-			return null;
+		{
+			if ( i != bookmark.length - 1 )
+				return null ;
+			while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 )
+			{
+				target -= cursor.length ;
+				cursor = cursor.nextSibling ;
+			}
+			cursor = cursor.nodeValue.charAt( target ) ;
+			if ( cursor == "" )
+				cursor = null ;
+		}
 	}
-	return currentNode ;
+	return cursor ;
 }
 // With this function, we can treat the bookmark as an iterator for DFS.
@@ -127,7 +182,6 @@ function NextPosition( bookmark )
 {
 	// See if there's anything further down the tree.
 	var next = bookmark.concat( [0] ) ;
 	if ( GetData( next ) != null )
 		return next ;
@@ -213,7 +267,7 @@ KmpMatch.prototype = {
 					this._State = 0;
 					return KMP_MATCHED;
 				}
-				return KMP_ADVANCED;
+				return KMP_ADVANCED ;
 			}
 			else if ( this._State == 0 )
 				return KMP_NOMATCH;
@@ -233,9 +287,10 @@ function _Find()
 {
 	// Start from the end of the current selection.
 	var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ;
-	var cursor = GetSelection().End ;
+	var cursor = GlobalRange.CreateBookmark2().End ;
 	var matchState = KMP_NOMATCH ;
 	var matchBookmark = null ;
+	var matchBookmarkStart = [] ;
 	// Match finding.
 	while ( true )
@@ -248,24 +303,39 @@ function _Find()
 			if ( data.tagName )
 			{
 				if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] )
+				{
 					matcher.Reset();
+					matchBookmarkStart = [] ;
+				}
 			}
 			else if ( data.charAt != undefined )
 			{
 				matchState = matcher.FeedCharacter(data) ;
+				// No possible match of any useful substring in the pattern for the currently scanned character.
+				// So delete any positional information.
 				if ( matchState == KMP_NOMATCH )
-					matchBookmark = null ;
-				else if ( matchState == KMP_ADVANCED && matchBookmark == null )
-					matchBookmark = { Start : cursor.concat( [] ) } ;
+					matchBookmarkStart = [] ;
+				// We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later.
+				else if ( matchState == KMP_ADVANCED )
+				{
+					matchBookmarkStart.push( cursor.concat( [] ) ) ;
+					if ( matchBookmarkStart.length > matcher._State )
+						matchBookmarkStart.shift() ;
+				}
+				// Found a complete match! Mark down the ending position as well.
 				else if ( matchState == KMP_MATCHED )
 				{
-					if ( matchBookmark == null )
-						matchBookmark = { Start : cursor.concat( [] ) } ;
-					matchBookmark.End = cursor.concat( [] ) ;
+					// It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character.
+					// So need to check and mark down the starting position as well.
+					if ( matchBookmarkStart.length == 0 )
+						matchBookmarkStart = [cursor.concat( [] )] ;
+					matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ;
 					matchBookmark.End[ matchBookmark.End.length - 1 ]++;
 					// Wait, do we have to match a whole word?
+					// If yes, carry out additional checks on what we've got.
 					if ( GetMatchWord() )
 					{
 						var startOk = false ;
@@ -310,74 +380,82 @@ function _Find()
 			break;
 	}
-	// If we've found a match, select the match.
+	// If we've found a match, highlight the match.
 	if ( matchState == KMP_MATCHED )
 	{
-		var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-		range.MoveToBookmark2( matchBookmark ) ;
-		range.Select() ;
-		var focus = range._Range.endContainer ;
+		GlobalRange.MoveToBookmark2( matchBookmark ) ;
+		Highlight() ;
+		var focus = GlobalRange._Range.endContainer ;
 		while ( focus && focus.nodeType != 1 )
 			focus = focus.parentNode ;
 		if ( focus )
-		focus.scrollIntoView( false ) ;
-		return true;
+		{
+			if ( oEditor.FCKBrowserInfo.IsSafari )
+				oEditor.FCKDomTools.ScrollIntoView( focus, false ) ;
+			else
+				focus.scrollIntoView( false ) ;
+		}
+		return true ;
 	}
 	else
-		return false;
+	{
+		ResetGlobalRange() ;
+		return false ;
+	}
 }
 function Find()
 {
-	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-	range.MoveToSelection() ;
-	range.Collapse( false ) ;
-	range.Select() ;
 	if ( ! _Find() )
+	{
+		ClearHighlight() ;
 		alert( FCKLang.DlgFindNotFoundMsg ) ;
+	}
 }
 function Replace()
 {
-	var selection = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-	selection.MoveToSelection() ;
-	if ( selection.CheckIsCollapsed() )
+	if ( GlobalRange.CheckIsCollapsed() )
 	{
 		if (! _Find() )
+		{
+			ClearHighlight() ;
 			alert( FCKLang.DlgFindNotFoundMsg ) ;
+		}
 	}
 	else
 	{
 		oEditor.FCKUndo.SaveUndoStep() ;
-		selection.DeleteContents() ;
-		selection.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
-		selection.Collapse( false ) ;
-		selection.Select() ;
+		GlobalRange.DeleteContents() ;
+		GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
+		GlobalRange.Collapse( false ) ;
 	}
 }
 function ReplaceAll()
 {
 	oEditor.FCKUndo.SaveUndoStep() ;
-	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
 	var replaceCount = 0 ;
 	while ( _Find() )
 	{
-		range.MoveToSelection() ;
-		range.DeleteContents() ;
-		range.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
-		range.Collapse( false ) ;
-		range.Select() ;
+		dialog.Selection.EnsureSelection() ;
+		GlobalRange.DeleteContents() ;
+		GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ;
+		GlobalRange.Collapse( false ) ;
 		replaceCount++ ;
 	}
 	if ( replaceCount == 0 )
+	{
+		ClearHighlight() ;
 		alert( FCKLang.DlgFindNotFoundMsg ) ;
-	window.parent.Cancel() ;
+	}
+	dialog.Cancel() ;
 }
+window.onunload = function(){ ClearHighlight() ; }
 	</script>
 </head>
 <body onload="OnLoad()" style="overflow: hidden">
@@ -389,7 +467,7 @@ function ReplaceAll()
 						Find what:</label>
 				</td>
 				<td width="100%">
-					<input id="txtFindFind" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
+					<input id="txtFindFind" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
 						type="text" />
 				</td>
 				<td>
@@ -416,7 +494,7 @@ function ReplaceAll()
 						Find what:</label>
 				</td>
 				<td width="100%">
-					<input id="txtFindReplace" onkeyup="btnStat(this.form)" style="width: 100%" tabindex="1"
+					<input id="txtFindReplace" onkeyup="btnStat()" oninput="btnStat()" onpaste="btnStatDelayed()" style="width: 100%" tabindex="1"
 						type="text" />
 				</td>
 				<td>