Ticket #6492: 6492_3.patch

_source/plugins/find/dialogs/find.js

@@ -598 +598 @@
                         searchRange.setEndAt( body, CKEDITOR.POSITION_BEFORE_END );
                         return searchRange;
                 }
+                
+                function getSelectedText( editor ) 
+                { 
+                        var selectedText = ''
+                                selection = editor.getSelection(); 
 
+                        if ( selection && selection.getType() == CKEDITOR.SELECTION_TEXT )
+                        { 
+                                if ( CKEDITOR.env.ie ) 
+                                { 
+                                        selection.unlock( 1 ); 
+                                        selectedText = selection.getNative().createRange().text; 
+                                        selection.lock();
+                                } 
+                                else 
+                                        selectedText = selection.getNative().toString(); 
+                        } 
+                        
+                        return selectedText;
+                }
+
                 var lang = editor.lang.findAndReplace;
                 return {
                         title : lang.title,
@@ -851 +871 @@
                                 finder.searchRange = getSearchRange();
 
                                 this.selectPage( startupPage );
+                                
+                                // Fill in the find field with the user selected text.
+                                var selectedContent = getSelectedText( this.getParentEditor() ),
+                                        pageId = this._.currentTabId,
+                                        patternFieldId = ( pageId == 'find' ? 'txtFindFind' : 'txtFindReplace' );
+
+                                this.getContentElement( pageId, patternFieldId ).setValue( selectedContent );
                         },
                         onHide : function()
                         {