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 @@
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