Ticket #3256: 3256_5.patch

_source/plugins/justify/plugin.js

@@ -66 +66 @@
         justifyCommand.prototype = {
                 exec : function( editor )
                 {
-                        var selection = editor.getSelection(),
-                                range = selection && selection.getRanges()[0];
-
-                        if ( !range )
+                        var selection = editor.getSelection();
+                        if ( !selection )
                                 return;
-
+                        
                         var bookmarks = selection.createBookmarks(),
-                                cssClassName = this.cssClassName,
-                                iterator = range.createIterator(),
-                                block;
+                                ranges = selection.getRanges();
 
-                        while ( ( block = iterator.getNextParagraph() ) )
-                        {
-                                block.removeAttribute( 'align' );
-
-                                if ( cssClassName )
-                                {
-                                        // Remove any of the alignment classes from the className.
-                                        var className = block.$.className =
-                                                CKEDITOR.tools.ltrim( block.$.className.replace( this.cssClassRegex, '' ) );
-
-                                        // Append the desired class name.
-                                        if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
-                                                block.addClass( cssClassName );
-                                        else if ( !className )
-                                                block.removeAttribute( 'class' );
-                                }
-                                else
-                                {
-                                        if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
-                                                block.setStyle( 'text-align', this.value );
-                                        else
-                                                block.removeStyle( 'text-align' );
-                                }
-                        }
-
+
+                        var cssClassName = this.cssClassName,
+                                iterator,
+                                block;
+                        for ( var i = ranges.length-1 ; i >= 0 ; i-- ) {
+                                iterator = ranges[ i ].createIterator();
+                                while ( ( block = iterator.getNextParagraph() ) )
+                                {
+                                        block.removeAttribute( 'align' );
+        
+                                        if ( cssClassName )
+                                        {
+                                                // Remove any of the alignment classes from the className.
+                                                var className = block.$.className =
+                                                        CKEDITOR.tools.ltrim( block.$.className.replace( this.cssClassRegex, '' ) );
+        
+                                                // Append the desired class name.
+                                                if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
+                                                        block.addClass( cssClassName );
+                                                else if ( !className )
+                                                        block.removeAttribute( 'class' );
+                                        }
+                                        else
+                                        {
+                                                if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
+                                                        block.setStyle( 'text-align', this.value );
+                                                else
+                                                        block.removeStyle( 'text-align' );
+                                        }
+                                }
+                                
+                        }
+
                         editor.focus();
                         editor.forceNextSelectionCheck();
                         selection.selectBookmarks( bookmarks );

_source/plugins/selection/plugin.js

@@ -869 +869 @@
                 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,
+                                bookmark;
+                        for ( var i = 0; i < length ; i++ )
+                        {
+                            retval.push( bookmark = ranges[ i ].createBookmark( serializable, true ) );
+
+                                var serializable = bookmark.serializable,
+                                        bookmarkStart = serializable ?
+                                                this.document.getById( bookmark.startNode )
+                                                : bookmark.startNode,
+                                        bookmarkEnd = serializable ?
+                                          this.document.getById( bookmark.endNode )
+                                          : bookmark.endNode;
+
+                            // Updating the offset values for rest of ranges which have been mangled(#3256).
+                            for ( var j = i + 1 ; j < length ; j++ )
+                            {
+                                var dirtyRange = ranges[ j ],
+                                       rangeStart = dirtyRange.startContainer,
+                                       rangeEnd = dirtyRange.endContainer;
+
+                               rangeStart.equals( bookmarkStart.getParent() ) && dirtyRange.startOffset++;
+                               rangeStart.equals( bookmarkEnd.getParent() ) && dirtyRange.startOffset++;
+                               rangeEnd.equals( bookmarkStart.getParent() ) && dirtyRange.endOffset++;
+                               rangeEnd.equals( bookmarkEnd.getParent() ) && dirtyRange.endOffset++;
+                            }
+                        }
+
                         return retval;
                 },