Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample01.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample01.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample01.html (revision 1329) @@ -44,5 +44,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample02.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample02.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample02.html (revision 1329) @@ -36,5 +36,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. - var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; + var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample03.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample03.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample03.html (revision 1329) @@ -79,5 +79,5 @@ function ChangeLanguage( languageCode ) { - window.location.href = window.location.pathname + "?" + languageCode ; + document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ; } @@ -112,5 +112,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var sLang ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample04.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample04.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample04.html (revision 1329) @@ -40,5 +40,5 @@ function ChangeLanguage( languageCode ) { - window.location.href = window.location.pathname + "?" + languageCode ; + document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ; } @@ -72,5 +72,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; // Get the toolbar from the URL. Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample05.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample05.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample05.html (revision 1329) @@ -45,5 +45,5 @@ function ChangeLanguage( languageCode ) { - window.location.href = window.location.pathname + "?" + languageCode ; + document.location.href = document.location.href.replace( /\?.*$/, '' ) + "?" + languageCode ; } @@ -78,5 +78,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; // Get the skin from the URL. Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample06.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample06.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample06.html (revision 1329) @@ -52,5 +52,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample07.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample07.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample07.html (revision 1329) @@ -44,5 +44,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample08.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample08.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample08.html (revision 1329) @@ -155,5 +155,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample09.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample09.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample09.html (revision 1329) @@ -69,5 +69,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor_Basic' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample10.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample10.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample10.html (revision 1329) @@ -51,5 +51,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample11_frame.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample11_frame.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample11_frame.html (revision 1329) @@ -41,5 +41,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor_1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample12.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample12.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample12.html (revision 1329) @@ -83,5 +83,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; // The following are the default configurations for the Enter and Shift+Enter modes. Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample13.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample13.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample13.html (revision 1329) @@ -86,5 +86,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. - var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; + var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; // Create an instance of FCKeditor (using the target textarea as the name). Index: /FCKeditor/branches/features/floating_dialog/_samples/html/sample14.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_samples/html/sample14.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_samples/html/sample14.html (revision 1329) @@ -46,5 +46,5 @@ // This is usefull only for these samples. A real application should use something like this: // oFCKeditor.BasePath = '/fckeditor/' ; // '/fckeditor/' is the default value. -var sBasePath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_samples')) ; +var sBasePath = document.location.href.substring(0,document.location.href.lastIndexOf('_samples')) ; var oFCKeditor = new FCKeditor( 'FCKeditor1' ) ; Index: /FCKeditor/branches/features/floating_dialog/_whatsnew.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/_whatsnew.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/_whatsnew.html (revision 1329) @@ -46,10 +46,6 @@
  • [#1643] Resolved several "strict warning" messages in Firefox when running FCKeditor.
    • -
  • [#1643] Resolved - several "strict warning" messages in Firefox when running FCKeditor.
    • -
  • [#1603] Certain - specific markup was making FCKeditor entering in a loop, blocking its execution.
    • -
  • [#1664] The ENTER - key will not any more swap the order of the tags when hit at the end of paragraphs.
    • +
  • [#1522] The ENTER + key will now work properly in IE with the cursor at the start of a formatted block.

    • Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckcontextmenu.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckcontextmenu.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckcontextmenu.js (revision 1329) @@ -124,5 +124,5 @@ if( !overrideButton ) { - var doc = e.target.ownerDocument ; + var doc = FCKTools.GetElementDocument( e.target ) ; overrideButton = FCKContextMenu_OverrideButton = doc.createElement('input') ; overrideButton.type = 'button' ; Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js (revision 1329) @@ -114,5 +114,5 @@ bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; - // Append a temporary   before the selection. + // Append a temporary  before the selection. // This is needed to avoid IE destroying selections inside empty // inline elements, like (#253). @@ -144,5 +144,5 @@ if ( bIsStartMakerAlone ) { - // Move the selection start to include the temporary  . + // Move the selection start to include the temporary . oIERange.moveStart( 'character', -1 ) ; Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js (revision 1329) @@ -415,5 +415,5 @@ // boundaries were on separated blocks, or none of them where on the // block limits (start/end). - if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock ) + if ( !bIsStartOfBlock && !bIsEndOfBlock ) { // If the next block is an

  • with another list tree as the first child @@ -421,5 +421,5 @@ if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild && eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) ) - eNextBlock.insertBefore( eNextBlock.ownerDocument.createTextNode( '\xa0' ), eNextBlock.firstChild ) ; + eNextBlock.insertBefore( FCKTools.GetElementDocument( eNextBlock ).createTextNode( '\xa0' ), eNextBlock.firstChild ) ; // Move the selection to the end block. if ( eNextBlock ) @@ -488,5 +488,5 @@ { // Move the selection to the new block. - oRange.MoveToNodeContents( eNewBlock ) ; + oRange.MoveToElementEditStart( eNewBlock ) ; oRange.Select() ; } Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js (revision 1329) @@ -127,5 +127,5 @@ if ( block.nodeName.IEquals( 'blockquote' ) ) { - var docFrag = block.ownerDocument.createDocumentFragment() ; + var docFrag = FCKTools.GetElementDocument( block ).createDocumentFragment() ; while ( block.firstChild ) { @@ -204,9 +204,9 @@ if ( node.nodeName.IEquals( 'div' ) ) { - var docFrag = node.ownerDocument.createDocumentFragment() ; + var docFrag = FCKTools.GetElementDocument( node ).createDocumentFragment() ; var needBeginBr = firstTime && node.previousSibling && !FCKListsLib.BlockBoundaries[node.previousSibling.nodeName.toLowerCase()] ; if ( firstTime && needBeginBr ) - docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ; + docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ; var needEndBr = node.nextSibling && !FCKListsLib.BlockBoundaries[node.nextSibling.nodeName.toLowerCase()] ; @@ -214,5 +214,5 @@ docFrag.appendChild( node.removeChild( node.firstChild ) ) ; if ( needEndBr ) - docFrag.appendChild( node.ownerDocument.createElement( 'br' ) ) ; + docFrag.appendChild( FCKTools.GetElementDocument( node ).createElement( 'br' ) ) ; node.parentNode.replaceChild( docFrag, node ) ; firstTime = false ; Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcklistcommands.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcklistcommands.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcklistcommands.js (revision 1329) @@ -253,5 +253,5 @@ FCKDomTools.SetElementMarker( markerObj, itemNode, '_FCK_ListItem_Processed', true ) ; } - var fakeParent = groupObj.root.ownerDocument.createElement( this.TagName ) ; + var fakeParent = FCKTools.GetElementDocument( groupObj.root ).createElement( this.TagName ) ; for ( var i = 0 ; i < selectedListItems.length ; i++ ) { @@ -271,5 +271,5 @@ { var contents = groupObj.contents ; - var doc = groupObj.root.ownerDocument ; + var doc = FCKTools.GetElementDocument( groupObj.root ) ; var listContents = [] ; Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js (revision 1329) @@ -881,5 +881,5 @@ if ( !paddingNode.childNodes.firstChild ) { - paddingNode.appendChild( paddingNode.ownerDocument.createTextNode( '\ufeff' ) ) ; + paddingNode.appendChild( FCKTools.GetElementDocument( paddingNode ).createTextNode( '\ufeff' ) ) ; clearContents = true ; } @@ -1156,2 +1156,3 @@ + Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js (revision 1329) @@ -768,5 +768,5 @@ if ( ! listArray || listArray.length < baseIndex + 1 ) return null ; - var doc = listArray[baseIndex].parent.ownerDocument ; + var doc = FCKTools.GetElementDocument( listArray[baseIndex].parent ) ; var retval = doc.createDocumentFragment() ; var rootNode = null ; @@ -947,5 +947,5 @@ { var currentElement = element ; - while ( currentElement != w.document.documentElement ) + while ( currentElement != FCKTools.GetElementDocument( currentElement ).documentElement ) { var currentWindow = FCKTools.GetElementWindow( currentElement ) ; @@ -999,2 +999,3 @@ + Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktablehandler.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktablehandler.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktablehandler.js (revision 1329) @@ -367,5 +367,5 @@ var baseColIdx = colIdx - selectionGeometry.x ; var baseRowIdx = rowIdx - selectionGeometry.y ; - var cellContents = refCell.ownerDocument.createDocumentFragment() ; + var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ; for ( var i = 0 ; i < selectionGeometry.height ; i++ ) { @@ -386,5 +386,5 @@ } if ( rowChildNodesCount > 0 ) - cellContents.appendChild( refCell.ownerDocument.createElement( 'br' ) ) ; + cellContents.appendChild( FCKTools.GetElementDocument( refCell ).createElement( 'br' ) ) ; } @@ -431,9 +431,9 @@ var nextCell = target.nextCell ; - var cellContents = refCell.ownerDocument.createDocumentFragment() ; + var cellContents = FCKTools.GetElementDocument( refCell ).createDocumentFragment() ; while ( nextCell && nextCell.childNodes && nextCell.childNodes.length > 0 ) cellContents.appendChild( nextCell.removeChild( nextCell.firstChild ) ) ; if ( cellContents.firstChild ) - cellContents.insertBefore( nextCell.ownerDocument.createElement( 'br' ), cellContents.firstChild ) ; + cellContents.insertBefore( FCKTools.GetElementDocument( nextCell ).createElement( 'br' ), cellContents.firstChild ) ; refCell.appendChild( cellContents ) ; this._MarkCells( [nextCell], '_Replace' ) ; @@ -461,5 +461,5 @@ // new cell gets floor(colSpan/2). var newCellSpan = Math.ceil( cellSpan / 2 ) ; - var newCell = refCell.ownerDocument.createElement( 'td' ) ; + var newCell = FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newCell ) ; @@ -489,5 +489,5 @@ { newRow.push( refCell ) ; - newRow.push( refCell.ownerDocument.createElement( 'td' ) ) ; + newRow.push( FCKTools.GetElementDocument( refCell ).createElement( 'td' ) ) ; if ( FCKBrowserInfo.IsGeckoLike ) FCKTools.AppendBogusBr( newRow[newRow.length - 1] ) ; @@ -756,5 +756,5 @@ for ( var i = 0 ; i < tableMap.length ; i++ ) { - var rowObj = table.ownerDocument.createElement( 'tr' ) ; + var rowObj = FCKTools.GetElementDocument( table ).createElement( 'tr' ) ; for ( var j = 0 ; j < tableMap[i].length ; ) { Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js (revision 1329) @@ -28,5 +28,5 @@ FCKXHtml.GetXHTML = function( node, includeNode, format ) { - FCKDomTools.CheckAndRemovePaddingNode( node.ownerDocument, FCKConfig.EnterMode ) ; + FCKDomTools.CheckAndRemovePaddingNode( FCKTools.GetElementDocument( node ), FCKConfig.EnterMode ) ; FCKXHtmlEntities.Initialize() ; Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html =================================================================== --- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html (revision 1328) +++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html (revision 1329) @@ -84,5 +84,5 @@