Ticket #798: 798.patch

_whatsnew.html

@@ -50 +50 @@
                         character inside text wasn't encoded in Opera and Safari.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed JavaScript
                         error with the fit window command in source mode.</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>
                 <a href="_whatsnew_history.html">See previous versions history</a></p>

editor/_source/internals/fck_contextmenu.js

@@ -341 +341 @@
 
 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 ) ;
 }

editor/_source/internals/fck_ie.js

@@ -136 +136 @@
 
         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.
         this.EditorDocument.attachEvent("onselectionchange", Doc_OnSelectionChange ) ;

editor/_source/internals/fckselection_ie.js

@@ -210 +210 @@
         return FCK.EditorDocument.selection ;
 }
 
-FCKSelection.Save = function( noFocus )
+FCKSelection.Save = function()
 {
-        // Ensures the editor has the selection focus. (#1801)
-        if ( !noFocus )
-                FCK.Focus() ;
-
         var editorDocument = FCK.EditorDocument ;
 
         if ( !editorDocument )
@@ -226 +222 @@
 
         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.
                 if ( range )