Changeset 6636

Timestamp:

04/03/11 14:50:11 (2 years ago)

Author:

garry.yao

Message:

#7437: Fixing cursor becomes blinded on collapsed selection because of a recent WebKit bug that breaks [6461].

File:

• CKEditor/trunk/_source/plugins/selection/plugin.js (modified) (1 diff)

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

@@ -187 +187 @@
                                         }, null, null, 10 );
 
-                                var fillingCharBefore;
+                                var fillingCharBefore,
+                                        resetSelection;
+
                                 function beforeData()
                                 {
-                                        var fillingChar = getFillingChar( editor.document );
-                                        fillingCharBefore = fillingChar && fillingChar.getText();
-                                        fillingCharBefore && fillingChar.setText( fillingCharBefore.replace( /\u200B/g, '' ) );
+                                        var doc = editor.document,
+                                                fillingChar = getFillingChar( doc );
+
+                                        if ( fillingChar )
+                                        {
+                                                // If cursor is right blinking by side of the filler node, save it for restoring,
+                                                // as the following text substitution will blind it. (#7437)
+                                                var sel = doc.$.defaultView.getSelection();
+                                                if ( sel.type == 'Caret' && sel.anchorNode == fillingChar.$ )
+                                                        resetSelection = 1;
+
+                                                fillingCharBefore = fillingChar.getText();
+                                                fillingChar.setText( fillingCharBefore.replace( /\u200B/g, '' ) );
+                                        }
                                 }
                                 function afterData()
                                 {
-                                                var fillingChar = getFillingChar( editor.document );
-                                                fillingChar && fillingChar.setText( fillingCharBefore );
+                                        var doc = editor.document,
+                                                fillingChar = getFillingChar( doc );
+
+                                        if ( fillingChar )
+                                        {
+                                                fillingChar.setText( fillingCharBefore );
+
+                                                if ( resetSelection )
+                                                {
+                                                        doc.$.defaultView.getSelection().setPosition( fillingChar.$,fillingChar.getLength() );
+                                                        resetSelection = 0;
+                                                }
+                                        }
                                 }
                                 editor.on( 'beforeUndoImage', beforeData );