Changeset 2375

Timestamp:

2008-08-25 22:13:02 (5 months ago)

Author:

alfonsoml

Message:

Make it possible to work with images inside floating divs. #798 and #2495

Location:

FCKeditor/trunk

Files:

• editor/_source/internals/fck_contextmenu.js (modified) (1 diff)
• editor/_source/internals/fck_ie.js (modified) (1 diff)
• editor/_source/internals/fckselection_ie.js (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js

@@ -342 +342 @@
 function FCK_ContextMenu_OnItemClick( item )
 {
-        FCK.Focus() ;
+        // IE might work incorrectly if we refocus the editor #798
+        if ( !FCKBrowserInfo.IsIE )
+                FCK.Focus() ;
+
         FCKCommands.GetCommand( item.Name ).Execute( item.CustomData ) ;
 }

FCKeditor/trunk/editor/_source/internals/fck_ie.js

@@ -137 +137 @@
         this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;
 
-        this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save( true ) ; } ) ;
+        this.EditorDocument.attachEvent("onbeforedeactivate", function(){ FCKSelection.Save() ; } ) ;
 
         // Catch cursor selection changes.

FCKeditor/trunk/editor/_source/internals/fckselection_ie.js

@@ -211 +211 @@
 }
 
-FCKSelection.Save = function( noFocus )
-{
-        // Ensures the editor has the selection focus. (#1801)
-        if ( !noFocus )
-                FCK.Focus() ;
-
+FCKSelection.Save = function()
+{
         var editorDocument = FCK.EditorDocument ;
 
@@ -227 +223 @@
         if ( selection )
         {
-                range = selection.createRange() ;
+                // The call might fail if the document doesn't have the focus (#1801), 
+                // but we don't want to modify the current selection (#2495) with a call to FCK.Focus() ;
+                try {
+                        range = selection.createRange() ;
+                }
+                catch(e) {}
 
                 // Ensure that the range comes from the editor document.
@@ -255 +256 @@
 FCKSelection.Restore = function()
 {
-        if ( this.SelectionData )
+        if ( this.SelectionData && this.SelectionData.createRange ) 
         {
                 FCK.IsSelectionChangeLocked = true ;

FCKeditor/trunk/_whatsnew.html

@@ -55 +55 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed
                         unnecessary name attributes in dialogs. </li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, 
+                        <a target="_blank" href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was
+                        placed inside a container with dimensions or floating it wasn't possible to edit its 
+                        properties from the toolbar or context menu.</li>
         </ul>
         <p>