Changeset 5994

Timestamp:

10/25/10 18:47:45 (3 years ago)

Author:

garry.yao

Message:

#5850: fixing an edge case in IE at the start of list where inline elements selection reported by the browser is wrong.

Location:

CKEditor/trunk

Files:

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

CKEditor/trunk/CHANGES.html

@@ -154 +154 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6501">#6501</a> : [IE9] Context menu item layout is broken.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/5730">#5730</a> : [Safari] Continual pastes (holding paste key) breaks document contents.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/5850">#5850</a> : [IE] Inline style misbehaviors at the beginning of numbered/bulleted list.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/6246">#6246</a> : Chinese Simplified;</li>

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

@@ -664 +664 @@
                                                         range.setEnd( new CKEDITOR.dom.node( boundaryInfo.container ), boundaryInfo.offset );
 
+                                                        // Correct an invalid IE range case on empty list item. (#5850)
+                                                        if ( range.endContainer.getPosition( range.startContainer ) & CKEDITOR.POSITION_PRECEDING
+                                                                        && range.endOffset <= range.startContainer.getIndex() )
+                                                        {
+                                                                range.collapse();
+                                                        }
+
                                                         return [ range ];
                                                 }
@@ -879 +886 @@
 
                                                         if ( !node || node.type != CKEDITOR.NODE_ELEMENT )
-                                                                return range.startContainer;
+                                                                node = range.startContainer;
 
                                                         var child = node.getFirst();
@@ -887 +894 @@
                                                                 child = child.getFirst();
                                                         }
-
-                                                        return node;
-                                                }
-                                        }
-
-                                        if ( CKEDITOR.env.ie )
-                                        {
-                                                range = sel.createRange();
-                                                range.collapse( 1 );
-
-                                                node = range.parentElement();
-                                        }
-                                        else
-                                        {
-                                                node = sel.anchorNode;
-
-                                                if ( node && node.nodeType != 1 )
-                                                        node = node.parentNode;
+                                                }
+                                                else
+                                                {
+                                                        node = range.startContainer;
+                                                        if ( node.type != CKEDITOR.NODE_ELEMENT )
+                                                                node = node.getParent();
+                                                }
+
+                                                node = node.$;
                                         }
                         }