Changeset 2113

Timestamp:

2008-06-23 18:58:18 (7 months ago)

Author:

fredck

Message:

Merged trunk into branches/versions/2.6.x. Final commit for the release of version 2.6.2.

Location:

FCKeditor/branches/versions/2.6.x

Files:

• _dev/build_release.bat (modified) (1 diff)
• editor/fckeditor.html (modified) (2 diffs)
• editor/filemanager/browser/default/browser.html (modified) (1 diff)
• editor/filemanager/browser/default/frmactualfolder.html (modified) (1 diff)
• editor/filemanager/browser/default/js/common.js (modified) (1 diff)
• editor/filemanager/browser/default/js/fckxml.js (modified) (2 diffs)
• editor/js/fckadobeair.js (modified) (1 diff)
• editor/plugins/dragresizetable/fckplugin.js (modified) (4 diffs)
• editor/_source/classes/fckdomrange.js (modified) (1 diff)
• editor/_source/classes/fckenterkey.js (modified) (2 diffs)
• editor/_source/classes/fckiecleanup.js (modified) (1 diff)
• editor/_source/fckeditorapi.js (modified) (2 diffs)
• editor/_source/internals/fckconfig.js (modified) (1 diff)
• editor/_source/internals/fckdebug_empty.js (added)
• editor/_source/internals/fckdebug.js (modified) (1 diff)
• editor/_source/internals/fckdialog.js (modified) (3 diffs)
• editor/_source/internals/fckdocumentprocessor.js (modified) (1 diff)
• editor/_source/internals/fckdomtools.js (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (3 diffs)
• editor/_source/internals/fck_ie.js (modified) (1 diff)
• editor/_source/internals/fck.js (modified) (2 diffs)
• editor/_source/internals/fckselection_gecko.js (modified) (2 diffs)
• editor/_source/internals/fckselection_ie.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)
• fckpackager.xml (modified) (2 diffs)
• _whatsnew_history.html (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/branches/versions/2.6.x/_dev/build_release.bat

@@ -26 +26 @@
 
 :: Update this variable for each new release.
-SET RELEASER_VERSION=2.6.1
+SET RELEASER_VERSION=2.6.2
 
 CLS

FCKeditor/branches/versions/2.6.x/editor/fckeditor.html

@@ -104 +104 @@
 LoadScript( '_source/internals/fckconfig.js' ) ;
 
-LoadScript( '_source/internals/fckdebug.js' ) ;
+LoadScript( '_source/internals/fckdebug_empty.js' ) ;
 LoadScript( '_source/internals/fckdomtools.js' ) ;
 LoadScript( '_source/internals/fcktools.js' ) ;
@@ -238 +238 @@
 FCKConfig_PreProcess() ;
 
-var FCK_InternalCSS                     = FCKConfig.FullBasePath + 'css/fck_internal.css' ;                                     // @Packager.RemoveLine
-var FCK_ShowTableBordersCSS     = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;       // @Packager.RemoveLine
+// Load the full debug script.
+if ( FCKConfig.Debug )
+        LoadScript( '_source/internals/fckdebug.js' ) ;
+
+        </script>
+        <script type="text/javascript">
+
+var FCK_InternalCSS                     = FCKConfig.BasePath + 'css/fck_internal.css' ;                                 // @Packager.RemoveLine
+var FCK_ShowTableBordersCSS     = FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;   // @Packager.RemoveLine
 /* @Packager.RemoveLine
 // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt).
-var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
-var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.FullBasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
+var FCK_InternalCSS                     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'html{min-height:100%}table.FCK__ShowTableBorders,table.FCK__ShowTableBorders td,table.FCK__ShowTableBorders th{border:#d3d3d3 1px solid}form{border:1px dotted #F00;padding:2px}.FCK__Flash{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_flashlogo.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__UnknownObject{border:#a9a9a9 1px solid;background-position:center center;background-image:url(images/fck_plugin.gif);background-repeat:no-repeat;width:80px;height:80px}.FCK__Anchor{border:1px dotted #00F;background-position:center center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;width:16px;height:15px;vertical-align:middle}.FCK__AnchorC{border:1px dotted #00F;background-position:1px center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}a[name]{border:1px dotted #00F;background-position:0 center;background-image:url(images/fck_anchor.gif);background-repeat:no-repeat;padding-left:18px}.FCK__PageBreak{background-position:center center;background-image:url(images/fck_pagebreak.gif);background-repeat:no-repeat;clear:both;display:block;float:none;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;border-right:0;border-left:0;height:5px}.FCK__InputHidden{width:19px;height:18px;background-image:url(images/fck_hiddenfield.gif);background-repeat:no-repeat;vertical-align:text-bottom;background-position:center center}.FCK__ShowBlocks p,.FCK__ShowBlocks div,.FCK__ShowBlocks pre,.FCK__ShowBlocks address,.FCK__ShowBlocks blockquote,.FCK__ShowBlocks h1,.FCK__ShowBlocks h2,.FCK__ShowBlocks h3,.FCK__ShowBlocks h4,.FCK__ShowBlocks h5,.FCK__ShowBlocks h6{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px;padding-left:8px}.FCK__ShowBlocks p{background-image:url(images/block_p.png)}.FCK__ShowBlocks div{background-image:url(images/block_div.png)}.FCK__ShowBlocks pre{background-image:url(images/block_pre.png)}.FCK__ShowBlocks address{background-image:url(images/block_address.png)}.FCK__ShowBlocks blockquote{background-image:url(images/block_blockquote.png)}.FCK__ShowBlocks h1{background-image:url(images/block_h1.png)}.FCK__ShowBlocks h2{background-image:url(images/block_h2.png)}.FCK__ShowBlocks h3{background-image:url(images/block_h3.png)}.FCK__ShowBlocks h4{background-image:url(images/block_h4.png)}.FCK__ShowBlocks h5{background-image:url(images/block_h5.png)}.FCK__ShowBlocks h6{background-image:url(images/block_h6.png)}' ) ;
+var FCK_ShowTableBordersCSS     = FCKTools.FixCssUrls( FCKConfig.BasePath + 'css/', 'table:not([border]),table:not([border]) > tr > td,table:not([border]) > tr > th,table:not([border]) > tbody > tr > td,table:not([border]) > tbody > tr > th,table:not([border]) > thead > tr > td,table:not([border]) > thead > tr > th,table:not([border]) > tfoot > tr > td,table:not([border]) > tfoot > tr > th,table[border=\"0\"],table[border=\"0\"] > tr > td,table[border=\"0\"] > tr > th,table[border=\"0\"] > tbody > tr > td,table[border=\"0\"] > tbody > tr > th,table[border=\"0\"] > thead > tr > td,table[border=\"0\"] > thead > tr > th,table[border=\"0\"] > tfoot > tr > td,table[border=\"0\"] > tfoot > tr > th{border:#d3d3d3 1px dotted}' ) ;
 @Packager.RemoveLine */
 

FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.html

@@ -44 +44 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmactualfolder.html

@@ -42 +42 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/js/common.js

@@ -37 +37 @@
                 }
                 catch( e )
-                {
-                        break ;
-                }
+                {}
 
                 // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...

FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/js/fckxml.js

@@ -62 +62 @@
                         if ( oXmlHttp.readyState == 4 )
                         {
-                                if ( ( oXmlHttp.status != 200 && oXmlHttp.status != 304 ) || oXmlHttp.responseXML == null || oXmlHttp.responseXML.firstChild == null )
+                                var oXml ;
+                                try
+                                {
+                                        // this is the same test for an FF2 bug as in fckxml_gecko.js
+                                        // but we've moved the responseXML assignment into the try{}
+                                        // so we don't even have to check the return status codes.
+                                        var test = oXmlHttp.responseXML.firstChild ;
+                                        oXml = oXmlHttp.responseXML ;
+                                }
+                                catch ( e )
+                                {
+                                        try
+                                        {
+                                                oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ;
+                                        }
+                                        catch ( e ) {}
+                                }
+
+                                if ( !oXml || !oXml.firstChild || oXml.firstChild.nodeName == 'parsererror' )
                                 {
                                         alert( 'The server didn\'t send back a proper XML response. Please contact your system administrator.\n\n' +
@@ -71 +89 @@
                                 }
 
-                                oFCKXml.DOMDocument = oXmlHttp.responseXML ;
+                                oFCKXml.DOMDocument = oXml ;
                                 asyncFunctionPointer( oFCKXml ) ;
                         }

FCKeditor/branches/versions/2.6.x/editor/js/fckadobeair.js

@@ -168 +168 @@
                 {
                         // Force pointing to the CSS files instead of using the inline CSS cached styles.
-                        window.FCK_InternalCSS                  = FCKConfig.FullBasePath + 'css/fck_internal.css' ;
-                        window.FCK_ShowTableBordersCSS  = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ;
+                        window.FCK_InternalCSS                  = FCKConfig.BasePath + 'css/fck_internal.css' ;
+                        window.FCK_ShowTableBordersCSS  = FCKConfig.BasePath + 'css/fck_showtableborders_gecko.css' ;
 
                         _Original_FCK_StartEditor.apply( this, arguments ) ;

FCKeditor/branches/versions/2.6.x/editor/plugins/dragresizetable/fckplugin.js

@@ -89 +89 @@
         "_ResizeBarMouseDownListener" : function( evt )
         {
-                if ( ! evt )
-                        evt = window.event ;
                 if ( FCKDragTableHandler._LeftCell )
                         FCKDragTableHandler._MouseMoveMode = 1 ;
@@ -122 +120 @@
                 FCKDragTableHandler._MaximumX = maxX + offset.x ;
                 FCKDragTableHandler._LastX = null ;
+
+                if (evt.preventDefault)
+                        evt.preventDefault();
+                else
+                        evt.returnValue = false;
         },
         "_ResizeBarMouseUpListener" : function( evt )
         {
-                if ( ! evt )
-                        evt = window.event ;
                 FCKDragTableHandler._MouseMoveMode = 0 ;
                 FCKDragTableHandler._HideResizeBar() ;
@@ -219 +220 @@
         "_ResizeBarMouseMoveListener" : function( evt )
         {
-                if ( ! evt )
-                        evt = window.event ;
                 if ( FCKDragTableHandler._MouseMoveMode == 0 )
                         return FCKDragTableHandler._MouseFindHandler( FCK, evt ) ;
@@ -422 +421 @@
                         var disabledListener = function( evt )
                         {
-                                if ( ! evt )
-                                        evt = window.event ;
                                 if ( evt.preventDefault )
                                         evt.preventDefault() ;

FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js

@@ -869 +869 @@
                 FCKDomTools.TrimNode( oFixedBlock ) ;
 
+                // If the fixed block is empty (not counting bookmark nodes)
+                // Add a <br /> inside to expand it.
+                if ( FCKDomTools.CheckIsEmptyElement(oFixedBlock, function( element ) { return element.getAttribute('_fck_bookmark') != 'true' ; } )
+                                && FCKBrowserInfo.IsGeckoLike )
+                                FCKTools.AppendBogusBr( oFixedBlock ) ;
+
                 // Insert the fixed block into the DOM.
                 this.InsertNode( oFixedBlock ) ;

FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js

@@ -44 +44 @@
                 [ 13            , 'Enter' ],
                 [ SHIFT + 13, 'ShiftEnter' ],
-                [ 9             , 'Tab' ],
                 [ 8                     , 'Backspace' ],
-                [ CTRL + 8              , 'CtrlBackspace' ],
+                [ CTRL + 8      , 'CtrlBackspace' ],
                 [ 46            , 'Delete' ]
         ] ) ;
 
-        if ( tabSpaces > 0 )
-        {
-                this.TabText = '' ;
-                while ( tabSpaces-- > 0 )
+        this.TabText = '' ;
+
+        // Safari by default inserts 4 spaces on TAB, while others make the editor
+        // loose focus. So, we need to handle it here to not include those spaces.
+        if ( tabSpaces > 0 || FCKBrowserInfo.IsSafari )
+        {
+                while ( tabSpaces-- )
                         this.TabText += '\xa0' ;
+
+                oKeystrokeHandler.SetKeystrokes( [ 9, 'Tab' ] );
         }
 
@@ -532 +536 @@
                 }
 
-                if ( FCKBrowserInfo.IsSafari )
+                if ( FCKBrowserInfo.IsGeckoLike )
                         FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
-                else if ( FCKBrowserInfo.IsGeckoLike )
-                        ( eNextBlock || eNewBlock ).scrollIntoView( false ) ;
 
                 oRange.Select() ;

FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckiecleanup.js

@@ -44 +44 @@
 function FCKIECleanup_Cleanup()
 {
-        if ( !this._FCKCleanupObj || !window.FCKUnloadFlag )
+        if ( !this._FCKCleanupObj || ( FCKConfig.MsWebBrowserControlCompat && !window.FCKUnloadFlag ) )
                 return ;
 

FCKeditor/branches/versions/2.6.x/editor/_source/fckeditorapi.js

@@ -165 +165 @@
 function FCKeditorAPI_Cleanup()
 {
-        if ( ! window.FCKUnloadFlag )
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat
+                        && !window.FCKUnloadFlag )
                 return ;
         delete FCKeditorAPI.Instances[ FCK.Name ] ;
@@ -171 +172 @@
 function FCKeditorAPI_ConfirmCleanup()
 {
-        window.FCKUnloadFlag = true ;
+        if ( window.FCKConfig && FCKConfig.MsWebBrowserControlCompat )
+                window.FCKUnloadFlag = true ;
 }
 FCKTools.AddEventListener( window, 'unload', FCKeditorAPI_Cleanup ) ;

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js

@@ -43 +43 @@
 
         FCKConfig.BasePath = sFullProtocol + FCKConfig.BasePath.substring( 0, FCKConfig.BasePath.lastIndexOf( '/' ) + 1) ;
-        FCKConfig.FullBasePath = FCKConfig.BasePath ;
 }
 else
-{
-        FCKConfig.BasePath = document.location.pathname.substring( 0, document.location.pathname.lastIndexOf( '/' ) + 1) ;
-        FCKConfig.FullBasePath = document.location.protocol + '//' + document.location.host + FCKConfig.BasePath ;
-}
+        FCKConfig.BasePath = document.location.protocol + '//' + document.location.host +
+                document.location.pathname.substring( 0, document.location.pathname.lastIndexOf( '/' ) + 1) ;
+
+FCKConfig.FullBasePath = FCKConfig.BasePath ;
 
 FCKConfig.EditorPath = FCKConfig.BasePath.replace( /editor\/$/, '' ) ;

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdebug.js

@@ -22 +22 @@
  */
 
-var FCKDebug = new Object() ;
+// Public function defined here must be declared in fckdebug_empty.js.
 
-FCKDebug._GetWindow = function()
+var FCKDebug =
 {
-        if ( !this.DebugWindow || this.DebugWindow.closed )
-                this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ;
+        Output : function( message, color, noParse )
+        {
+                if ( ! FCKConfig.Debug )
+                        return ;
 
-        return this.DebugWindow ;
-}
+                try
+                {
+                        this._GetWindow().Output( message, color ) ;
+                }
+                catch ( e ) {}   // Ignore errors
+        },
 
-FCKDebug.Output = function( message, color, noParse )
-{
-        if ( ! FCKConfig.Debug )
-                return ;
+        OutputObject : function( anyObject, color )
+        {
+                if ( ! FCKConfig.Debug )
+                        return ;
 
-        try
+                try
+                {
+                        this._GetWindow().OutputObject( anyObject, color ) ;
+                }
+                catch ( e ) {}   // Ignore errors
+        },
+
+        _GetWindow : function()
         {
-                this._GetWindow().Output( message, color ) ;
+                if ( !this.DebugWindow || this.DebugWindow.closed )
+                        this.DebugWindow = window.open( FCKConfig.BasePath + 'fckdebug.html', 'FCKeditorDebug', 'menubar=no,scrollbars=yes,resizable=yes,location=no,toolbar=no,width=600,height=500', true ) ;
+
+                return this.DebugWindow ;
         }
-        catch ( e ) {}   // Ignore errors
-}
-
-FCKDebug.OutputObject = function( anyObject, color )
-{
-        if ( ! FCKConfig.Debug )
-                return ;
-
-        try
-        {
-                this._GetWindow().OutputObject( anyObject, color ) ;
-        }
-        catch ( e ) {}   // Ignore errors
-}
+} ;

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js

@@ -99 +99 @@
                         // Calculate the dialog position, centering it on the screen.
                         var viewSize = FCKTools.GetViewPaneSize( topWindow ) ;
-                        var scrollPosition = FCKTools.GetScrollPosition( topWindow ) ;
+                        var scrollPosition = { 'X' : 0, 'Y' : 0 } ;
+                        if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
+                                FCKTools.GetScrollPosition( topWindow ) ;
                         var iTop  = Math.max( scrollPosition.Y + ( viewSize.Height - height - 20 ) / 2, 0 ) ;
                         var iLeft = Math.max( scrollPosition.X + ( viewSize.Width - width - 20 )  / 2, 0 ) ;
@@ -106 +108 @@
                         var dialog = topDocument.createElement( 'iframe' ) ;
                         FCKTools.ResetStyles( dialog ) ;
-                        dialog.src = FCKConfig.FullBasePath + 'fckdialog.html' ;
+                        dialog.src = FCKConfig.BasePath + 'fckdialog.html' ;
 
                         // Dummy URL for testing whether the code in fckdialog.js alone leaks memory.
@@ -115 +117 @@
                         FCKDomTools.SetElementStyles( dialog,
                                         {
-                                                'position'      : 'absolute',
+                                                'position'      : ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 ) ? 'absolute' : 'fixed',
                                                 'top'           : iTop + 'px',
                                                 'left'          : iLeft + 'px',

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js

@@ -46 +46 @@
         var oImg = FCKTools.GetElementDocument( realElement ).createElement( 'IMG' ) ;
         oImg.className = fakeClass ;
-        oImg.src = FCKConfig.FullBasePath + 'images/spacer.gif' ;
+        oImg.src = FCKConfig.BasePath + 'images/spacer.gif' ;
         oImg.setAttribute( '_fckfakelement', 'true', 0 ) ;
         oImg.setAttribute( '_fckrealelement', FCKTempBin.AddElement( realElement ), 0 ) ;

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js

@@ -973 +973 @@
 
         /**
-         * Current implementation for ScrollIntoView (due to #1462). We don't have
-         * a complete implementation here, just the things that fit our needs.
+         * Current implementation for ScrollIntoView (due to #1462 and #2279). We
+         * don't have a complete implementation here, just the things that fit our
+         * needs.
          */
         ScrollIntoView : function( element, alignTop )

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js

@@ -350 +350 @@
 FCK.InsertHtml = function( html )
 {
+        var doc = FCK.EditorDocument ;
+
         html = FCKConfig.ProtectedSource.Protect( html ) ;
         html = FCK.ProtectEvents( html ) ;
@@ -358 +360 @@
         FCKUndo.SaveUndoStep() ;
 
+        if ( FCKBrowserInfo.IsGecko )
+        {
+                // Using the following trick,   present at the beginning and at
+                // the end of the HTML are preserved (#2248).
+                html = '<span id="__fakeFCKRemove1__" style="display:none;">fakeFCKRemove</span>' + html + '<span id="__fakeFCKRemove2__" style="display:none;">fakeFCKRemove</span>' ;
+        }
+
         // Insert the HTML code.
-        this.EditorDocument.execCommand( 'inserthtml', false, html ) ;
+        doc.execCommand( 'inserthtml', false, html ) ;
+
+        if ( FCKBrowserInfo.IsGecko )
+        {
+                // Remove the fake nodes.
+                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ;
+                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ;
+        }
+
         this.Focus() ;
 
@@ -367 +384 @@
         var bookmark = range.CreateBookmark() ;
 
-        FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+        FCKDocumentProcessor.Process( doc ) ;
 
         // Restore caret position, ignore any errors in case the document

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js

@@ -30 +30 @@
         if ( !FCK._BehaviorsStyle )
         {
-                var sBasePath = FCKConfig.FullBasePath ;
+                var sBasePath = FCKConfig.BasePath ;
                 var sTableBehavior = '' ;
                 var sStyle ;
 
-                // The behaviors should be pointed using the FullBasePath to avoid security
+                // The behaviors should be pointed using the BasePath to avoid security
                 // errors when using a different BaseHref.
                 sStyle = '<style type="text/css" _fcktemp="true">' ;