Ticket #6492: 6492_2.patch

_source/plugins/find/dialogs/find.js

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