Ticket #3256: 3256.patch

_source/plugins/domiterator/plugin.js

@@ -31 +31 @@
                 return next;
         }
 
+        /**
+         *  Evaluator for skipping bookmark nodes.
+         */
+        function bookmarkEvaluator( node )
+        {
+                return !( node && node.is && node.is ( 'span' )
+                                        && node.hasAttribute( '_fck_bookmark' )
+                                        || !node.is && !bookmarkEvaluator( node.getParent() ) )
+        }
+
         var iterator = function( range )
         {
                 if ( arguments.length < 1 )
@@ -65 +75 @@
                         {
                                 range = this.range.clone();
                                 range.enlarge( this.forceBrBreak ? CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
+                                
+                                var walker;
+                                walker = new CKEDITOR.dom.walker( range )
+                                // Skip bookmark nodes.
+                                walker.evaluator = bookmarkEvaluator;   
+                                this._.nextNode = walker.next();
 
-                                var boundary = range.getBoundaryNodes();
-                                this._.nextNode = boundary.startNode;
-                                this._.lastNode = boundary.endNode.getNextSourceNode( true );
+                                range = range.clone();
+                                range.collapse();
+                                range.setEndAt( range.document.getBody(), CKEDITOR.POSITION_BEFORE_END );
+                                walker = new CKEDITOR.dom.walker( range );
+                                // Skip bookmark nodes.
+                                walker.evaluator = bookmarkEvaluator;
+                                this._.lastNode = walker.next();
+
                                 // Probably the document end is reached, we need a marker node.
                                 if ( !this._.lastNode )
                                 {
@@ -73 +94 @@
                                 if ( !this._.lastNode )
                                 {
                                                 this._.lastNode = range.document.createText( '' );
-                                                this._.lastNode.insertAfter(  boundary.endNode );
+                                                range.document.getBody().append( this._.lastNode );
                                 }
 
                                 // Let's reuse this variable.

_source/plugins/justify/plugin.js

@@ -67 +67 @@
                 exec : function( editor )
                 {
                         var selection = editor.getSelection(),
-                                range = selection && selection.getRanges()[0];
+                                ranges = selection && selection.getRanges();
 
-                        if ( !range )
+                        if ( !ranges )
                                 return;
 
                         var bookmarks = selection.createBookmarks(),
@@ -74 +74 @@
 
                         var bookmarks = selection.createBookmarks(),
                                 cssClassName = this.cssClassName,
-                                iterator = range.createIterator(),
+                                iterator,
                                 block;
-
-                        while ( ( block = iterator.getNextParagraph() ) )
-                        {
-                                block.removeAttribute( 'align' );
-
-                                if ( cssClassName )
+                        for ( var i = ranges.length-1 ; i >= 0 ; i-- ) {
+                                iterator = ranges[ i ].createIterator();
+                                while ( ( block = iterator.getNextParagraph() ) )
                                 {
-                                        // 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 );
+                                        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
-                                                block.removeStyle( 'text-align' );
+                                        {
+                                                if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
+                                                        block.setStyle( 'text-align', this.value );
+                                                else
+                                                        block.removeStyle( 'text-align' );
+                                        }
                                 }
+                                
                         }
 
                         editor.focus();