Changeset 7560

Timestamp:

07/12/12 18:50:55 (10 months ago)

Author:

garry.yao

Message:

Re-fixed #8978, not to use IE native bookmark, which is known to be buggy on old IEs, from #9116.

Location:

CKEditor/trunk/_source

Files:

• core/dom/range.js (modified) (2 diffs)
• plugins/selection/plugin.js (modified) (5 diffs)

CKEditor/trunk/_source/core/dom/range.js

@@ -1844 +1844 @@
                         }
 
-                        // Antecipate the trim() call here, so the walker will not make
-                        // changes to the DOM, which would not get reflected into this
-                        // range otherwise.
-                        this.trim();
-
                         // We need to grab the block element holding the start boundary, so
                         // let's use an element path for it.
@@ -1877 +1872 @@
                                         return false;
                         }
-
-                        // Antecipate the trim() call here, so the walker will not make
-                        // changes to the DOM, which would not get reflected into this
-                        // range otherwise.
-                        this.trim();
 
                         // We need to grab the block element holding the start boundary, so

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

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