Ticket #6957: 6957.patch

_source/plugins/find/dialogs/find.js

@@ -68 +68 @@
 
         var findDialog = function( editor, startupPage )
         {
-                // Style object for highlights: (#5018)
-                // 1. Defined as full match style to avoid compromising ordinary text color styles.
-                // 2. Must be apply onto inner-most text to avoid conflicting with ordinary text color styles visually.
-                var highlightStyle = new CKEDITOR.style( CKEDITOR.tools.extend( { fullMatch : true, childRule : function(){ return 0; } },
-                        editor.config.find_highlight ) );
-
                 /**
                  * Iterator which walk through the specified range char by char. By
                  * default the walking will not stop at the character boundaries, until
@@ -252 +246 @@
                                 if ( this._.cursors.length < 1 )
                                         return;
 
-                                // Remove the previous highlight if there's one.
-                                if ( this._.highlightRange )
-                                        this.removeHighlight();
+                                var range = this.toDomRange();
+                                range.select();
 
-                                // Apply the highlight.
-                                var range = this.toDomRange(),
-                                        bookmark = range.createBookmark();
-                                highlightStyle.applyToRange( range );
-                                range.moveToBookmark( bookmark );
-                                this._.highlightRange = range;
-
-                                // Scroll the editor to the highlighted area.
-                                var element = range.startContainer;
-                                if ( element.type != CKEDITOR.NODE_ELEMENT )
-                                        element = element.getParent();
-                                element.scrollIntoView();
-
-                                // Update the character cursors.
-                                this.updateFromDomRange( range );
-                        },
+                                if ( !CKEDITOR.env.ie )
+                                {
+                                        // Scroll the range into view for non-IEs.
+                                        var root = range.getCommonAncestor( 1, 1 );
+                                        root.scrollIntoView();
+                                }
+                                else
+                                {
+                                        // Update the character range in IE
+                                        // after making a selection.
+                                        this.updateFromDomRange( range );
+                                }
 
-                        /**
-                         * Remove highlighted find result.
-                         */
-                        removeHighlight : function()
-                        {
-                                if ( !this._.highlightRange )
-                                        return;
-
-                                var bookmark = this._.highlightRange.createBookmark();
-                                highlightStyle.removeFromRange( this._.highlightRange );
-                                this._.highlightRange.moveToBookmark( bookmark );
-                                this.updateFromDomRange( this._.highlightRange );
-                                this._.highlightRange = null;
+                                this._.highlightRange = range;
                         },
 
                         isReadOnly : function()
                         {
-                                if ( !this._.highlightRange )
-                                        return 0;
-
                                 return this._.highlightRange.startContainer.isReadOnly();
                         },
 
@@ -454 +428 @@
                                 || wordSeparatorRegex.test( c );
                 };
 
+                function toggleDesignMode( on )
+                {
+                        if ( CKEDITOR.env.ie && editor.mode == 'wysiwyg' )
+                                editor.document.getBody().$.contentEditable = !!on;
+                }
+
                 var finder = {
                         searchRange : null,
                         matchRange : null,
@@ -466 +446 @@
                                                         pattern.length );
                                 else
                                 {
-                                        this.matchRange.removeHighlight();
                                         this.matchRange = this.matchRange.getNextCharacterRange( pattern.length );
                                 }
 
@@ -509 +488 @@
                                 }
 
                                 this.matchRange.clearMatched();
-                                this.matchRange.removeHighlight();
                                 // Clear current session and restart with the default search
                                 // range.
                                 // Re-run the finding once for cyclic.(#3517)
@@ -543 +521 @@
                                                 && !this.matchRange._.isReplaced && !this.matchRange.isReadOnly() )
                                 {
                                         // Turn off highlight for a while when saving snapshots.
-                                        this.matchRange.removeHighlight();
                                         var domRange = this.matchRange.toDomRange();
                                         var text = editor.document.createText( newString );
                                         if ( !isReplaceAll )
@@ -742 +719 @@
 
                                                                                 // Scope to full document.
                                                                                 finder.searchRange = getSearchRange( 1 );
-                                                                                if ( finder.matchRange )
-                                                                                {
-                                                                                        finder.matchRange.removeHighlight();
-                                                                                        finder.matchRange = null;
-                                                                                }
+                                                                                finder.matchRange = null;
                                                                                 editor.fire( 'saveSnapshot' );
                                                                                 while ( finder.replace( dialog,
                                                                                         dialog.getValueOf( 'replace', 'txtFindReplace' ),
@@ -850 +823 @@
                         },
                         onShow : function()
                         {
+                                toggleDesignMode( 0 );
+
                                 // Establish initial searching start position.
                                 finder.searchRange = getSearchRange();
 
@@ -867 +842 @@
                         },
                         onHide : function()
                         {
+                                toggleDesignMode( 1 );
+
                                 var range;
                                 if ( finder.matchRange && finder.matchRange.isMatched() )
                                 {
-                                        finder.matchRange.removeHighlight();
                                         editor.focus();
-
                                         range = finder.matchRange.toDomRange();
                                         if ( range )
                                                 editor.getSelection().selectRanges( [ range ] );

_source/plugins/find/plugin.js

@@ -31 +31 @@
 
         requires : [ 'styles' ]
 } );
-
-/**
- * Defines the style to be used to highlight results with the find dialog.
- * @type Object
- * @default { element : 'span', styles : { 'background-color' : '#004', 'color' : '#fff' } }
- * @example
- * // Highlight search results with blue on yellow.
- * config.find_highlight =
- *     {
- *         element : 'span',
- *         styles : { 'background-color' : '#ff0', 'color' : '#00f' }
- *     };
- */
-CKEDITOR.config.find_highlight = { element : 'span', styles : { 'background-color' : '#004', 'color' : '#fff' } };