Changeset 5604

Timestamp:

06/12/10 11:14:11 (3 years ago)

Author:

garry.yao

Message:

Disable selection fix when browser put cursor after non-editable elements.

File:

• CKEditor/branches/features/contenteditable/_source/plugins/wysiwygarea/plugin.js (modified) (1 diff)

CKEditor/branches/features/contenteditable/_source/plugins/wysiwygarea/plugin.js

@@ -234 +234 @@
                                 if ( previousElement && previousElement.getName
                                          && !( previousElement.getName() in nonExitableElementNames )
-                                         && isBlankParagraph( previousElement )
-                                         && range.moveToElementEditStart( previousElement )
                                          || nextElement && nextElement.getName
-                                                && !( nextElement.getName() in nonExitableElementNames )
-                                                && isBlankParagraph( nextElement )
-                                                && range.moveToElementEditStart( nextElement ) )
+                                                && !( nextElement.getName() in nonExitableElementNames ) )
                                 {
-                                        fixedBlock.remove();
+                                        if ( isBlankParagraph( previousElement ) && range.moveToElementEditStart( previousElement )
+                                                        || isBlankParagraph( nextElement ) && range.moveToElementEditStart( nextElement ) )
+                                                fixedBlock.remove();
+
+                                        // Firefox prefer to anchor cursor after non-editable elements
+                                        // when navigate to them, leaving native behavior untouched. (#5834)
+                                        if ( CKEDITOR.env.gecko && ( previousElement.isReadOnly() || nextElement.isReadOnly() ) )
+                                        {
+                                                range.moveToPosition( fixedBlock, CKEDITOR.POSITION_BEFORE_START );
+                                                fixedBlock.remove();
+                                        }
                                 }
                         }