Changeset 659

Timestamp:

2007-08-13 10:42:53 (17 months ago)

Author:

martinkou

Message:

Fixed again the issue where add/remove list commands would delete all contents in the current block.
Fix for #1060 : Made FCKeditor run in Gran Paradiso.

Location:

FCKeditor/trunk/editor/_source

Files:

• fckeditorapi.js (modified) (1 diff)
• internals/fckdomtools.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/fckeditorapi.js

@@ -112 +112 @@
                                 eval.call( oParentWindow, sScript ) ;
                         }
-                        else if ( FCKBrowserInfo.IsSafari )
+                        else if ( FCKBrowserInfo.IsSafari || FCKBrowserInfo.IsGecko )
                         {
-                                // oParentWindow.eval in Safari executes in the calling window
+                                // oParentWindow.eval in Safari and Gran Paradiso executes in the calling window
                                 // environment, instead of the parent one. The following should make it work.
                                 var oParentDocument = oParentWindow.document ;

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

@@ -330 +330 @@
                 if ( doc.body.childNodes.length == 1 
                                 && doc.body.firstChild.nodeType == 1
+                                && doc.body.firstChild.tagName.toLowerCase() == 'br'
                                 && ( doc.body.firstChild.getAttribute( '_moz_dirty' ) != null 
                                         || doc.body.firstChild.getAttribute( 'type' ) == '_moz' ) )