Changeset 3977

Timestamp:

07/27/09 16:55:52 (4 years ago)

Author:

garry.yao

Message:

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

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/styles/plugin.js (modified) (3 diffs)

CKEditor/trunk/CHANGES.html

@@ -186 +186 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4087">#4087</a> : [Firefox]Fixed extra blocks created on create list when full document selected.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4097">#4097</a> : No undo/redo support for fontColor and backgroundColor buttons.</li>
-                <li><a href="http://dev.fckeditor.net/ticket/4100">#4100</a> : [IE]Fixed Navigation keyset has no effect on panel.</li>
-                <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> 
+                <li><a href="http://dev.fckeditor.net/ticket/4111">#4111</a> : Fixed apply block style after inline style applied on full document error.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/styles/plugin.js

@@ -316 +316 @@
                 if ( !lastNode )
                 {
-                                lastNode = document.createText( '' );
+                                var marker;
+                                lastNode = marker = document.createText( '' );
                                 lastNode.insertAfter( range.endContainer );
                 }
@@ -337 +338 @@
                         if ( !lastNode )
                         {
-                                lastNode = document.createText( '' );
+                                lastNode = marker = document.createText( '' );
                                 lastNode.insertAfter( firstNode );
                         }
@@ -498 +499 @@
                 }
 
-//              this._FixBookmarkStart( startNode );
-
+                // Remove the temporary marking node.(#4111)
+                marker && marker.remove();
                 range.moveToBookmark( bookmark );
         }