Changeset 2171

Timestamp:

2008-07-04 09:00:18 (6 months ago)

Author:

martinkou

Message:

Fixed the issue where the edit div and delete div context menues don't appear in Firefox/Windows when the user right clicks in the empty space inside the div or in the paragraphs.

Location:

FCKeditor/branches/features/div_container/editor

Files:

• dialog/fck_div.html (modified) (1 diff)
• _source/internals/fck_contextmenu.js (modified) (1 diff)
• _source/internals/fckselection_gecko.js (modified) (1 diff)

FCKeditor/branches/features/div_container/editor/dialog/fck_div.html

@@ -38 +38 @@
 var AlwaysCreate = dialog.Args().CustomValue ;
 
-var ActiveEl = !AlwaysCreate ? dialog.Selection.GetSelection().MoveToAncestorNode( 'DIV' ) : null ;
-if ( ActiveEl )
-{
-        ActiveEl = ( new FCKElementPath( ActiveEl ) ).BlockLimit ;
+var ActiveEl = null ;
+if ( !AlwaysCreate )
+{
+        var oSelection = dialog.Selection.GetSelection() ;
+        ActiveEl = ( new FCKElementPath( oSelection.GetSelectedElement() || oSelection.GetParentElement() ) ).BlockLimit ;
         if ( ActiveEl && ActiveEl.nodeName.toLowerCase() != 'div' )
                 ActiveEl = null ;

FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js

@@ -298 +298 @@
                         AddItems : function( menu, tag, tagName )
                         {
-                                var path = new FCKElementPath( FCKSelection.GetParentElement() ) ;
+                                var path = new FCKElementPath( FCKSelection.GetSelectedElement() || FCKSelection.GetParentElement() ) ;
                                 if ( path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) )
                                 {

FCKeditor/branches/features/div_container/editor/_source/internals/fckselection_gecko.js

@@ -76 +76 @@
                 if ( oSel )
                 {
-                        // make the common case fast - for collapsed/nearly collapsed selections just return anchor.parent.
+                        // if anchorNode == focusNode, see if the selection is text only or including nodes.
+                        // if text only, return the parent node.
+                        // if the selection includes DOM nodes, then the anchorNode is the nearest container.
                         if ( oSel.anchorNode && oSel.anchorNode == oSel.focusNode )
-                                return oSel.anchorNode.parentNode ;
+                        {
+                                var oRange = oSel.getRangeAt( 0 ) ;
+                                if ( oRange.collapsed || oRange.startContainer.nodeType == 3 )
+                                        return oSel.anchorNode.parentNode ;
+                                else
+                                        return oSel.anchorNode ;
+                        }
 
                         // looks like we're having a large selection here. To make the behavior same as IE's TextRange.parentElement(),