Changeset 7518

Timestamp:

06/27/12 18:23:51 (11 months ago)

Author:

garry.yao

Message:

Employed IE range's bookmark to defend against trimmed text nodes on saved range.

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -62 +62 @@
                 <li><a href="http://dev.ckeditor.com/ticket/8985">#8985</a> : Better handling of ENTER key events on dialogs.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/8925">#8925</a> : [Firefox] Unexpected page scroll on large floating block when editor is re-focused.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/8978">#8978</a> : [IE] Saved editor text selection is lost after close menu.</li>
         </ul>
         <h3>

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

@@ -280 +280 @@
                                                 // than firing the selection change event.
 
-                                                var savedRange,
+                                                var savedBookmark,
                                                         saveEnabled,
                                                         restoreEnabled = 1;
@@ -295 +295 @@
 
                                                                 // Give the priority to locked selection since it probably
-                                                                // reflects the actual situation, besides locked selection
-                                                                // could be interfered because of text nodes normalizing.
-                                                                // (#6083, #6987)
+                                                                // reflects the actual situation. (#6083, #6987)
                                                                 var lockedSelection = doc.getCustomData( 'cke_locked_selection' );
                                                                 if ( lockedSelection )
@@ -306 +304 @@
                                                                 // Then check ff we have saved a range, restore it at this
                                                                 // point.
-                                                                else if ( savedRange && restoreEnabled )
+                                                                else if ( savedBookmark && restoreEnabled )
                                                                 {
+                                                                        var range = doc.getSelection().getNative().createRange();
+                                                                        range.moveToBookmark( savedBookmark );
                                                                         // Well not break because of this.
-                                                                        try { savedRange.select(); } catch (e) {}
-                                                                        savedRange = null;
+                                                                        try { range.select(); } catch (e) {}
+                                                                        savedBookmark = null;
                                                                 }
                                                         });
@@ -533 +533 @@
                                                                 }
 
-                                                                savedRange = nativeSel && sel.getRanges()[ 0 ];
+                                                                // Create an IE Range bookmark to defeat possible text node normalization.
+                                                                try { savedBookmark = nativeSel && nativeSel.createRange().getBookmark(); }
+                                                                catch(er){}
 
                                                                 checkSelectionChangeTimeout.call( editor );