Changeset 3977


Ignore:
Timestamp:
07/27/2009 04:55:52 PM (5 years ago)
Author:
garry.yao
Message:

Fixing #4111: apply block style after inline style applied on full document error.

Location:
CKEditor/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CKEditor/trunk/CHANGES.html

    r3976 r3977  
    186186                <li><a href="http://dev.fckeditor.net/ticket/4087">#4087</a> : [Firefox]Fixed extra blocks created on create list when full document selected.</li> 
    187187                <li><a href="http://dev.fckeditor.net/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li> 
    188                 <li><a href="http://dev.fckeditor.net/ticket/4100">#4100</a> : [IE]Fixed Navigation keyset has no effect on panel.</li> 
    189                 <li><a href="http://dev.fckeditor.net/ticket/4084">#4084</a> : In Firefox image dialog using Kama skin was sticked to left viewport border.</li>  
     188                <li><a href="http://dev.fckeditor.net/ticket/4111">#4111</a> : Fixed apply block style after inline style applied on full document error.</li> 
    190189        </ul> 
    191190        <h3> 
  • CKEditor/trunk/_source/plugins/styles/plugin.js

    r3968 r3977  
    316316                if ( !lastNode ) 
    317317                { 
    318                                 lastNode = document.createText( '' ); 
     318                                var marker; 
     319                                lastNode = marker = document.createText( '' ); 
    319320                                lastNode.insertAfter( range.endContainer ); 
    320321                } 
     
    337338                        if ( !lastNode ) 
    338339                        { 
    339                                 lastNode = document.createText( '' ); 
     340                                lastNode = marker = document.createText( '' ); 
    340341                                lastNode.insertAfter( firstNode ); 
    341342                        } 
     
    498499                } 
    499500 
    500 //              this._FixBookmarkStart( startNode ); 
    501  
     501                // Remove the temporary marking node.(#4111) 
     502                marker && marker.remove(); 
    502503                range.moveToBookmark( bookmark ); 
    503504        } 
Note: See TracChangeset for help on using the changeset viewer.
© 2003 – 2012 CKSource – Frederico Knabben. All rights reserved. | Terms of use | Privacy policy