Changeset 6459

Timestamp:

02/18/11 07:19:38 (2 years ago)

Author:

garry.yao

Message:

#6987: A small flaw when restore selection from opened dialog in IE.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/selection/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -65 +65 @@
                 <li><a href="http://dev.ckeditor.com/ticket/4475">#4475</a> : Protected source in attributes and inline CSS text are not handled.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6984">#6984</a> : [FF] Tailing line breaks are lost in enter mode BR.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6987">#6987</a> : [IE] Text selection lost when calling editor::insertHtml from dialog in some situation.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7124">#7124</a> : Czech;</li>

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

@@ -135 +135 @@
                                                                 if ( savedRange )
                                                                 {
-                                                                        // Range restored here might invalidate the DOM structure thus break up
-                                                                        // the locked selection, give it up. (#6083)
-                                                                        var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
-                                                                        if ( restoreEnabled && !lockedSelection )
+                                                                        if ( restoreEnabled )
                                                                         {
                                                                                 // Well not break because of this.
@@ -147 +144 @@
                                                                                 catch (e)
                                                                                 {}
+
+                                                                                // Update locked selection because of the normalized text nodes. (#6083, #6987)
+                                                                                var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
+                                                                                if ( lockedSelection )
+                                                                                {
+                                                                                        lockedSelection.unlock();
+                                                                                        lockedSelection.lock();
+                                                                                }
                                                                         }