Ticket #3475: 3475_3.patch

_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;
                         },

_source/plugins/selection/plugin.js

@@ -868 +868 @@
                 createBookmarks : function( serializable )
                 {
                         var retval = [],
-                                ranges = this.getRanges();
-                        for ( var i = 0 ; i < ranges.length ; i++ )
-                                retval.push( ranges[i].createBookmark( serializable ) );
+                                ranges = this.getRanges(),
+                                length = ranges.length;
+                        // Adding bookmark in reverse order to avoid interacting.
+                        for ( var i = length -1 ; i  >= 0 ; i-- )
+                                // Defer the bookmark updates later after all ranges get processed.
+                                retval.push( ranges[ i ].createBookmark( serializable, true ) );
+                        
+                        // Update all ranges to reflect the changes from bookmark adding.(#3475)
+                        for ( i = length -1 ; i >= 0 ; i-- )
+                                ranges[ i ].moveToBookmark( retval[ i ], false );
+                                
+                        // Revert both back to sequenced order.
+                        ranges.reverse();
+                        retval.reverse();
+                        
+                        // Generally it's enough to just update ranges caches.
+                        this._.cache.ranges = ranges;
                         return retval;
                 },
 
@@ -887 +901 @@
 
                 selectBookmarks : function( bookmarks )
                 {
-                        var ranges = [];
-                        for ( var i = 0 ; i < bookmarks.length ; i++ )
+                        var ranges = [], l = bookmarks.length;
+
+                        // Removing bookmarks in sequence order to avoid interacting.
+                        for ( var i = 0 ; i < l ; i++ )
                         {
                                 var range = new CKEDITOR.dom.range( this.document );
-                                range.moveToBookmark( bookmarks[i] );
+                                range.moveToBookmark( bookmarks[ i ] );
                                 ranges.push( range );
                         }
                         this.selectRanges( ranges );

_source/core/dom/range.js

@@ -363 +363 @@
                  *              must contain ids, which can be used to restore the range even
                  *              when these nodes suffer mutations (like a clonation or innerHTML
                  *              change).
+                 * @param {Boolean} [deferUpdate] Whether update the range to reflect
+                 *      the inserting of bookmark nodes or manually update it later.
                  * @returns {Object} And object representing a bookmark.
                  */
-                createBookmark : function( serializable )
+                createBookmark : function( serializable , deferUpdate )
                 {
                         var startNode, endNode;
                         var baseId;
@@ -403 +405 @@
                         clone.collapse( true );
                         clone.insertNode( startNode );
 
-                        // Update the range position.
-                        if ( endNode )
-                        {
-                                this.setStartAfter( startNode );
-                                this.setEndBefore( endNode );
-                        }
-                        else
-                                this.moveToPosition( startNode, CKEDITOR.POSITION_AFTER_END );
-
-                        return {
+                        var retval = {
                                 startNode : serializable ? baseId + 'S' : startNode,
                                 endNode : serializable ? baseId + 'E' : endNode,
                                 serializable : serializable
@@ -417 +410 @@
                                 endNode : serializable ? baseId + 'E' : endNode,
                                 serializable : serializable
                         };
+
+                        if ( !deferUpdate )
+                                this.moveToBookmark( retval, false );
+
+                        return retval;
                 },
+                
 
                 /**
                  * Creates a "non intrusive" and "mutation sensible" bookmark. This
@@ -512 +511 @@
                                 is2                     : true          // It's a createBookmark2 bookmark.
                         };
                 },
-
-                moveToBookmark : function( bookmark )
+                
+                /**
+                 *  Move the range position to what indicate by the bookmark and
+                 *  optionally remove the bookmark nodes.
+                 *  @param {Object} bookmark Any bookmark created via
+                 *  {@link CKEDITOR.dom.range::createBookmark} OR
+                 *  {@link CKEDITOR.dom.range.createBookmark2} functions.
+                 *  @param {Boolean} [dropNodes ] Whether remove the bookmark nodes after
+                 *  move to the destination position.(defaults to be 'true')
+                */
+                moveToBookmark : function( bookmark, dropNodes )
                 {
                         if ( bookmark.is2 )             // Created with createBookmark2().
                         {
@@ -544 +552 @@
                                 this.setStartBefore( startNode );
 
                                 // Remove it, because it may interfere in the setEndBefore call.
-                                startNode.remove();
+                                if ( dropNodes !== false )
+                                        startNode.remove();
 
                                 // Set the range end at the bookmark end node position, or simply
                                 // collapse it if it is not available.
@@ -551 +560 @@
                                 if ( endNode )
                                 {
                                         this.setEndBefore( endNode );
-                                        endNode.remove();
+                                        if ( dropNodes !== false )
+                                                endNode.remove();
                                 }
                                 else
                                         this.collapse( true );

_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 first, since the ranges might be dirty later then.
+                var selection = document.getSelection(),
+                        bookmarks = selection.createBookmarks(),
+                        ranges = selection.getRanges();
                 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 );
         }
 })();