Ticket #3475: 3475_2.patch

_source/plugins/styles/plugin.js

@@ -119 +119 @@
                 {
                         applyStyle.call( this, document, true );
                 },
-
+                
+                /**
+                 * Apply the current style to the specified range.
+                 * Note : the range will be mangled after this method, 
+                 * so the range should be bookmarked before invoking it.
+                 * 
+                 * @param {CKEDITOR.dom.range} range
+                 * @example 
+                 * // Apply style defined as 'mystyle' to a range.
+                 * var style = new CKEDITOR.style( editor.config.mystyle );
+                 * var bookmark = range.createBookmark();
+                 * style.spplyToRange( range );
+                 * range.moveToBookmark( bookmark );
+                 */
                 applyToRange : function( range )
                 {
                         return ( this.applyToRange =
@@ -130 +143 @@
                                                 : null ).call( this, range );
                 },
 
+                /**
+                 * @see {@link CKEDITOR.style.applyToRange}
+                 */
                 removeFromRange : function( range )
                 {
                         return ( this.removeFromRange =
@@ -305 +321 @@
                 // Get the DTD definition for the element. Defaults to "span".
                 var dtd = CKEDITOR.dtd[ elementName ] || ( isUnknownElement = true, CKEDITOR.dtd.span );
 
-                // Bookmark the range so we can re-select it after processing.
-                var bookmark = range.createBookmark();
-
                 // Expand the range.
                 range.enlarge( CKEDITOR.ENLARGE_ELEMENT );
                 range.trim();
@@ -503 +516 @@
                         }
                 }
 
-//              this._FixBookmarkStart( startNode );
-
-                range.moveToBookmark( bookmark );
         }
 
         function removeInlineStyle( range )
@@ -1030 +1040 @@
 
         function applyStyle( document, remove )
         {
-                // Get all ranges from the selection.
-                var selection = document.getSelection();
-                var ranges = selection.getRanges();
+                // Creating bookmarks here, since the range might be
+                // mangled during processing.
+                var selection = document.getSelection(),
+                        ranges = selection.getRanges(),
+                        bookmarks = selection.createBookmarks();
                 var func = remove ? this.removeFromRange : this.applyToRange;
 
-                // Apply the style to the ranges.
-                for ( var i = 0 ; i < ranges.length ; i++ )
+                // Apply the style to the ranges in reverse order to avoid
+                // range changes could impact on others. (#3475)
+                for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
                         func.call( this, ranges[ i ] );
 
-                // Select the ranges again.
-                selection.selectRanges( ranges );
+                selection.selectBookmarks( bookmarks );
         }
 })();
 

_source/plugins/find/dialogs/find.js

@@ -279 +279 @@
                                         this.removeHighlight();
 
                                 // Apply the highlight.
-                                var range = this.toDomRange();
+                                var range = this.toDomRange(),
+                                        bookmark = range.createBookmark();
                                 highlightStyle.applyToRange( range );
+                                range.moveToBookmark( bookmark );
                                 this._.highlightRange = range;
 
                                 // Scroll the editor to the highlighted area.
@@ -301 +303 @@
                                 if ( !this._.highlightRange )
                                         return;
 
+                                var bookmark = this._.highlightRange.createBookmark();
                                 highlightStyle.removeFromRange( this._.highlightRange );
+                                this._.highlightRange.moveToBookmark( bookmark );
                                 this.updateFromDomRange( this._.highlightRange );
                                 this._.highlightRange = null;
                         },