Index: /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 2064) @@ -1,3 +1,3 @@ -@ECHO OFF +@ECHO OFF :: @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6 +SET RELEASER_VERSION=2.6.1 CLS Index: /FCKeditor/branches/versions/2.6.x/_dev/css_compression.txt =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/css_compression.txt (revision 2064) +++ /FCKeditor/branches/versions/2.6.x/_dev/css_compression.txt (revision 2064) @@ -0,0 +1,41 @@ +** + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == +** + +The following is the normal procedure to compress CSS data to be included in +the editor source or configuration files. + +1. Open the CSS compression tool page: + http://iceyboard.no-ip.org/projects/css_compressor + +2. Paste the full CSS data in the "CSS" text box. + +3. Leave all default options, expect in the "Output options" box, unchecking + the following items: + + - Show statistics + - Output in colour + +4. Submit the form. + +5. In the results page, hit CTRL+A to select all data and copy it to the + clipboard. + +6. Paste the data as is in the desired place. Index: /FCKeditor/branches/versions/2.6.x/_dev/domain_fix_template.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/domain_fix_template.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_dev/domain_fix_template.js (revision 2064) @@ -26,5 +26,5 @@ // ### Minified Script (must be updated on changes in the original below). -(function(){var d=document.domain;while (true){try{var A=window.top.opener.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); +(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); // ### Original Script. @@ -39,5 +39,5 @@ try { - var test = window.top.opener.document.domain ; + var test = window.parent.document.domain ; break ; } Index: /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php (revision 2064) @@ -1,3 +1,3 @@ -#!/usr/bin/php -q +#!/usr/bin/php -q - + @@ -34,9 +34,12 @@ This page lists all data posted by the form.
- - - - - +
Field Name  Value
+ + + + + + + <% lcForm=REQUEST.Form() @@ -52,5 +55,5 @@ lcWert=STRTRAN(lcWert,">",">") && ... if wanted remove/translate HTML Chars ... - ? [] + ? [] ENDIF NEXT Index: /FCKeditor/branches/versions/2.6.x/_samples/asp/sampleposteddata.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/asp/sampleposteddata.asp (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/asp/sampleposteddata.asp (revision 2064) @@ -29,5 +29,5 @@ - + @@ -35,9 +35,12 @@ This page lists all data posted by the form.
-
Field NameValue
]+lcVariable+[ =]+lcWert+[
]+lcVariable+[ =
]+lcWert+[
- - - - +
Field Name  Value
+ + + + + + + <% Dim sForm @@ -45,6 +48,6 @@ %> - - + + <% Next %> Index: /FCKeditor/branches/versions/2.6.x/_samples/cfm/sampleposteddata.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/cfm/sampleposteddata.cfm (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/cfm/sampleposteddata.cfm (revision 2064) @@ -39,21 +39,20 @@
- -
Field NameValue
<%=sForm%><%=Server.HTMLEncode( Request.Form(sForm) )%><%=sForm%>
<%=Server.HTMLEncode( Request.Form(sForm) )%>
+
+ + + + + + + - - - - + - - + + Index: /FCKeditor/branches/versions/2.6.x/_samples/html/sample01.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/html/sample01.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/html/sample01.html (revision 2064) @@ -38,5 +38,5 @@
- + -
Field NameValue
Dump of FORM Variables
FieldNamesFieldNames #FORM.fieldNames#
#key##HTMLEditFormat( evaluate( "FORM.#key#" ) )##key#
#HTMLEditFormat( evaluate( "FORM.#key#" ) )#
- - Index: /FCKeditor/branches/versions/2.6.x/_samples/lasso/sampleposteddata.lasso =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/lasso/sampleposteddata.lasso (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/lasso/sampleposteddata.lasso (revision 2064) @@ -29,5 +29,5 @@ - + @@ -35,13 +35,16 @@ This page lists all data posted by the form.
- - - - - +
Field Name  Value
+ + + + + + + [iterate(client_postparams, local('this'))] - - + + [/iterate] Index: /FCKeditor/branches/versions/2.6.x/_samples/perl/sampleposteddata.cgi =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/perl/sampleposteddata.cgi (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/perl/sampleposteddata.cgi (revision 2064) @@ -71,5 +71,4 @@ print <<"_HTML_TAG_"; - @@ -77,5 +76,5 @@ - + @@ -83,9 +82,12 @@ This page lists all data posted by the form.
-
Field NameValue
[#this->first][#this->second][#this->first]
[#this->second]
- - - - +
Field Name  Value
+ + + + + + + _HTML_TAG_ @@ -94,6 +96,6 @@ print <<"_HTML_TAG_"; - - + + _HTML_TAG_ Index: /FCKeditor/branches/versions/2.6.x/_samples/php/sampleposteddata.php =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/php/sampleposteddata.php (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/php/sampleposteddata.php (revision 2064) @@ -29,5 +29,5 @@ - + @@ -35,9 +35,12 @@ This page lists all data posted by the form.
-
Field NameValue
$key$postedValue$key
$postedValue
- - - - +
Field Name  Value
+ + + + + + + - - + + -
Field NameValue
- - - - +
Field Name  Value
+ + + + + + + """ for key in form.keys(): @@ -65,6 +68,6 @@ print """ - - + + """ % (key, value) Index: /FCKeditor/branches/versions/2.6.x/_samples/sample.css =================================================================== --- /FCKeditor/branches/versions/2.6.x/_samples/sample.css (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_samples/sample.css (revision 2064) @@ -22,5 +22,5 @@ */ -body, td, input, select, textarea +body, td, th, input, select, textarea { font-size: 12px; @@ -37,14 +37,37 @@ form { - margin: 0px 0px 0px 0px; - padding: 0px 0px 0px 0px; + margin: 0; + padding: 0; +} + +#outputSample +{ + table-layout:fixed; } pre { - margin:0px; - padding:0px; - white-space: pre-wrap; /* css-3 */ - white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ + margin: 0; + padding: 0; + + white-space: pre; /* CSS2 */ + white-space: -moz-pre-wrap; /* Mozilla*/ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS 2.1 */ + white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */ + word-wrap: break-word; /* IE */ } + +#outputSample thead th +{ + color: #dddddd; + background-color: #999999; + padding: 4px; + white-space: nowrap; +} + +#outputSample tbody th +{ + vertical-align: top; + text-align: left; +} Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 2064) @@ -34,260 +34,114 @@ FCKeditor ChangeLog - What's New?

- Version 2.6

-

- No changes. The stabilization of the 2.6 RC was completed successfully, as expected.

-

- Version 2.6 RC

+ Version 2.6.1

New Features and Improvements:

Fixed Bugs:

-

- Version 2.6 Beta 1

-

- New Features and Improvements:

-

- Fixed Bugs:

- -

- See previous versions history -

+ See previous versions history

Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 2064) @@ -33,4 +33,262 @@

FCKeditor ChangeLog - What's New?

+

+ Version 2.6

+

+ No changes. The stabilization of the 2.6 RC was completed successfully, as expected.

+

+ Version 2.6 RC

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+ +

+ Version 2.6 Beta 1

+

+ New Features and Improvements:

+ +

+ Fixed Bugs:

+

Version 2.5.1

Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange.js (revision 2064) @@ -460,5 +460,5 @@ var addrStart = this._Range.startContainer ; var addrEnd = this._Range.endContainer ; - while ( curStart && curStart.nodeType == 3 ) + while ( curStart && addrStart.nodeType == 3 ) { bookmark.Start[0] += curStart.length ; @@ -466,5 +466,5 @@ curStart = curStart.previousSibling ; } - while ( curEnd && curEnd.nodeType == 3 ) + while ( curEnd && addrEnd.nodeType == 3 ) { bookmark.End[0] += curEnd.length ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 2064) @@ -98,9 +98,9 @@ oIFrame.frameBorder = 0 ; - oIFrame.width = oIFrame.height = '100%' ; + oIFrame.style.width = oIFrame.style.height = '100%' ; if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE ) { - window._FCKHtmlToLoad = sOverrideError + html ; + window._FCKHtmlToLoad = html.replace( //i, '' + sOverrideError ) ; oIFrame.src = 'javascript:void( (function(){' + 'document.open() ;' + @@ -134,5 +134,5 @@ oDoc.open() ; - oDoc.write( sOverrideError + html ) ; + oDoc.write( html.replace( //i, '' + sOverrideError ) ) ; oDoc.close() ; } @@ -248,4 +248,5 @@ { oDoc.body.innerHTML = this._BodyHTML ; + oDoc.body.offsetLeft ; // Don't remove, this is a hack to fix Opera 9.50, see #2264. this._BodyHTML = null ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckenterkey.js (revision 2064) @@ -169,4 +169,26 @@ } + // On IE, it is better for us handle the deletion if the caret is preceeded + // by a
(#1383). + if ( FCKBrowserInfo.IsIE ) + { + var previousElement = FCKDomTools.GetPreviousSourceElement( oRange.StartNode, true ) ; + + if ( previousElement && previousElement.nodeName.toLowerCase() == 'br' ) + { + // Create a range that starts after the
and ends at the + // current range position. + var testRange = oRange.Clone() ; + testRange.SetStart( previousElement, 4 ) ; + + // If that range is empty, we can proceed cleaning that
manually. + if ( testRange.CheckIsEmpty() ) + { + previousElement.parentNode.removeChild( previousElement ) ; + return true ; + } + } + } + var oStartBlock = oRange.StartBlock ; var oEndBlock = oRange.EndBlock ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 2064) @@ -67,9 +67,10 @@ { var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ; + FCKTools.ResetStyles( oIFrame ); oIFrame.src = 'javascript:void(0)' ; oIFrame.allowTransparency = true ; oIFrame.frameBorder = '0' ; oIFrame.scrolling = 'no' ; - oIFrame.width = oIFrame.height = 0 ; + oIFrame.style.width = oIFrame.style.height = '0px' ; FCKDomTools.SetElementStyles( oIFrame, { @@ -280,6 +281,6 @@ var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; var iHeight = eMainNode.offsetHeight ; - me._IFrame.width = iWidth ; - me._IFrame.height = iHeight ; + me._IFrame.style.width = iWidth + 'px' ; + me._IFrame.style.height = iHeight + 'px' ; }, 0 ) ; @@ -306,5 +307,5 @@ // It is better to set the sizes to 0, otherwise Firefox would have // rendering problems. - this._IFrame.width = this._IFrame.height = 0 ; + this._IFrame.style.width = this._IFrame.style.height = '0px' ; this._IsOpened = false ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_gecko.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_gecko.js (revision 2064) @@ -33,8 +33,12 @@ oXmlHttp.send( null ) ; - if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) + if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) ) + { oXml = oXmlHttp.responseXML ; - else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) - oXml = oXmlHttp.responseXML ; + // #1426: Fallback if responseXML isn't set for some + // reason (e.g. improperly configured web server) + if ( !oXml ) + oXml = (new DOMParser()).parseFromString( oXmlHttp.responseText, 'text/xml' ) ; + } else oXml = null ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_ie.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckxml_ie.js (revision 2064) @@ -41,12 +41,17 @@ oXmlHttp.send( null ) ; - if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 ) + if ( oXmlHttp.status == 200 || oXmlHttp.status == 304 || ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) ) + { this.DOMDocument = oXmlHttp.responseXML ; - else if ( oXmlHttp.status == 0 && oXmlHttp.readyState == 4 ) - { - this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ; - this.DOMDocument.async = false ; - this.DOMDocument.resolveExternals = false ; - this.DOMDocument.loadXML( oXmlHttp.responseText ) ; + + // #1426: Fallback if responseXML isn't set for some + // reason (e.g. improperly configured web server) + if ( !this.DOMDocument || this.DOMDocument.firstChild == null ) + { + this.DOMDocument = FCKTools.CreateXmlObject( 'DOMDocument' ) ; + this.DOMDocument.async = false ; + this.DOMDocument.resolveExternals = false ; + this.DOMDocument.loadXML( oXmlHttp.responseText ) ; + } } else Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fckfitwindow.js (revision 2064) @@ -84,4 +84,5 @@ eEditorFrameStyle.position = "absolute"; + eEditorFrame.offsetLeft ; // Kludge for Safari 3.1 browser bug, do not remove. See #2066. eEditorFrameStyle.zIndex = FCKConfig.FloatingPanelsZIndex - 1; eEditorFrameStyle.left = "0px"; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 2064) @@ -199,4 +199,11 @@ if ( oNewBlock || oNode.nodeValue.Trim().length > 0 ) bMoveNode = true ; + break; + + // Comment Node + case 8 : + if ( oNewBlock ) + bMoveNode = true ; + break; } @@ -890,4 +897,12 @@ && FCK.EditorDocument.body.firstChild == paddingNode ) { + /* + * Bug #1764: Don't move the selection if the + * current selection isn't in the editor + * document. + */ + if ( FCKSelection._GetSelectionDocument( FCK.EditorDocument.selection ) != FCK.EditorDocument ) + return ; + var range = FCK.EditorDocument.body.createTextRange() ; var clearContents = false ; @@ -1176,2 +1191,22 @@ } } + +/* + * #1633 : Protect the editor iframe from external styles. + * Notice that we can't use FCKTools.ResetStyles here since FCKTools isn't + * loaded yet. + */ +(function() +{ + var el = window.frameElement ; + var width = el.width ; + var height = el.height ; + if ( /^\d+$/.test( width ) ) width += 'px' ; + if ( /^\d+$/.test( height ) ) height += 'px' ; + var style = el.style ; + style.border = style.padding = style.margin = 0 ; + style.backgroundColor = 'transparent'; + style.backgroundImage = 'none'; + style.width = width ; + style.height = height ; +})() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 2064) @@ -105,5 +105,5 @@ // only perform the patched behavior if we're in an tag, or the End key is pressed. var parentTag = node.parentNode.tagName.toLowerCase() ; - if ( ! ( parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' || + if ( ! ( parentTag == 'a' || ( !FCKBrowserInfo.IsOpera && String(node.parentNode.contentEditable) == 'false' ) || ( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] ) && keyCode == 35 ) ) ) @@ -362,5 +362,19 @@ this.Focus() ; + // Save the caret position before calling document processor. + var range = new FCKDomRange( this.EditorWindow ) ; + range.MoveToSelection() ; + var bookmark = range.CreateBookmark() ; + FCKDocumentProcessor.Process( FCK.EditorDocument ) ; + + // Restore caret position, ignore any errors in case the document + // processor removed the bookmark s for some reason. + try + { + range.MoveToBookmark( bookmark ) ; + range.Select() ; + } + catch ( e ) {} // For some strange reason the SaveUndoStep() call doesn't activate the undo button at the first InsertHtml() call. @@ -402,4 +416,10 @@ var aCreatedLinks = new Array() ; + // Only for Safari, a collapsed selection may create a link. All other + // browser will have no links created. So, we check it here and return + // immediatelly, having the same cross browser behavior. + if ( FCKSelection.GetSelection().isCollapsed ) + return aCreatedLinks ; + FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ; @@ -420,10 +440,4 @@ var oLink = oLinksInteractor.snapshotItem( i ) ; oLink.href = url ; - - // It may happen that the browser (aka Safari) decides to use the - // URL as the link content to not leave it empty. In this case, - // let's reset it. - if ( sTempUrl == oLink.innerHTML ) - oLink.innerHTML = '' ; aCreatedLinks.push( oLink ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 2064) @@ -151,4 +151,5 @@ // FCK.Focus() ; + FCKSelection.Restore() ; FCK.EditorWindow.focus() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckbrowserinfo.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckbrowserinfo.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckbrowserinfo.js (revision 2064) @@ -29,5 +29,4 @@ IsIE7 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 7 ), IsIE6 : /*@cc_on!@*/false && ( parseInt( s.match( /msie (\d+)/ )[1], 10 ) >= 6 ), - IsGecko : s.Contains('gecko/'), IsSafari : s.Contains(' applewebkit/'), // Read "IsWebKit" IsOpera : !!window.opera, @@ -39,9 +38,11 @@ (function( browserInfo ) { + browserInfo.IsGecko = ( navigator.product == 'Gecko' ) && !browserInfo.IsSafari && !browserInfo.IsOpera ; browserInfo.IsGeckoLike = ( browserInfo.IsGecko || browserInfo.IsSafari || browserInfo.IsOpera ) ; if ( browserInfo.IsGecko ) { - var geckoVersion = s.match( /gecko\/(\d+)/ )[1] ; + var geckoMatch = s.match( /rv:(\d+\.\d+)/ ) ; + var geckoVersion = geckoMatch && parseFloat( geckoMatch[1] ) ; // Actually "10" refers to Gecko versions before Firefox 1.5, when @@ -52,10 +53,9 @@ // be 1.7 (we are assuming that rv < 1.7 will not have build > 20051111). - // TODO: Future versions may consider the rv number only, but it is - // still to check that all Gecko based browser present the rv number. - browserInfo.IsGecko10 = ( ( geckoVersion < 20051111 ) || ( /rv:1\.7/.test(s) ) ) ; - browserInfo.IsGecko19 = /rv:1\.9/.test(s) ; + if ( geckoVersion ) + { + browserInfo.IsGecko10 = ( geckoVersion < 1.8 ) ; + browserInfo.IsGecko19 = ( geckoVersion > 1.8 ) ; + } } - else - browserInfo.IsGecko10 = false ; })(FCKBrowserInfo) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 2064) @@ -76,13 +76,4 @@ } - var resetStyles = function( element ) - { - element.style.cssText = 'margin:0;' + - 'padding:0;' + - 'border:0;' + - 'background-color:transparent;' + - 'background-image:none;' ; - } - return { /** @@ -114,6 +105,6 @@ // Setup the IFRAME that will hold the dialog. var dialog = topDocument.createElement( 'iframe' ) ; - resetStyles( dialog ) ; - dialog.src = FCKConfig.BasePath + 'fckdialog.html' ; + FCKTools.ResetStyles( dialog ) ; + dialog.src = FCKConfig.FullBasePath + 'fckdialog.html' ; // Dummy URL for testing whether the code in fckdialog.js alone leaks memory. @@ -180,5 +171,5 @@ // Setup the DIV that will be used to cover. cover = topDocument.createElement( 'div' ) ; - resetStyles( cover ) ; + FCKTools.ResetStyles( cover ) ; FCKDomTools.SetElementStyles( cover, { @@ -196,5 +187,5 @@ { var iframe = topDocument.createElement( 'iframe' ) ; - resetStyles( iframe ) ; + FCKTools.ResetStyles( iframe ) ; iframe.hideFocus = true ; iframe.frameBorder = 0 ; @@ -219,4 +210,10 @@ FCKFocusManager.Lock() ; + + // Prevent the user from refocusing the disabled + // editing window by pressing Tab. (Bug #2065) + var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ; + el._fck_originalTabIndex = el.tabIndex ; + el.tabIndex = -1 ; }, @@ -225,4 +222,9 @@ FCKDomTools.RemoveNode( cover ) ; FCKFocusManager.Unlock() ; + + // Revert the tab index hack. (Bug #2065) + var el = FCK.ToolbarSet.CurrentInstance.GetInstanceObject( 'frameElement' ) ; + el.tabIndex = el._fck_originalTabIndex ; + FCKDomTools.ClearElementJSProperty( el, '_fck_originalTabIndex' ) ; }, Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdocumentprocessor.js (revision 2064) @@ -248,2 +248,18 @@ fakeImg.setAttribute( '_fckflash', 'true', 0 ); } ) ; + +// Buggy tags added by Safari. +if ( FCKBrowserInfo.IsSafari ) +{ + FCKDocumentProcessor.AppendNew().ProcessDocument = function( doc ) + { + var spans = doc.getElementsByClassName ? + doc.getElementsByClassName( 'Apple-style-span' ) : + Array.prototype.filter.call( + doc.getElementsByTagName( 'span' ), + function( item ){ return item.className == 'Apple-style-span' ; } + ) ; + for ( var i = spans.length - 1 ; i >= 0 ; i-- ) + FCKDomTools.RemoveNode( spans[i], true ) ; + } +} Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcklanguagemanager.js (revision 2064) @@ -51,4 +51,5 @@ 'fr-ca' : 'French (Canada)', gl : 'Galician', + gu : 'Gujarati', he : 'Hebrew', hi : 'Hindi', Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 2064) @@ -79,4 +79,5 @@ Html4DocType : /HTML 4\.0 Transitional/i , DocTypeTag : /]*>/i , +HtmlDocType : /DTD HTML/ , // These regex are used to save the original event attributes in the HTML. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 2064) @@ -261,5 +261,8 @@ // Don't repeat the restore process if the editor document is already selected. if ( this._GetSelectionDocument( FCK.EditorDocument.selection ) == FCK.EditorDocument ) + { + FCK.IsSelectionChangeLocked = false ; return ; + } this.SelectionData.select() ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktools.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktools.js (revision 2064) @@ -739,2 +739,11 @@ return "javascript: void(0);" ; // All other browsers. } + +FCKTools.ResetStyles = function( element ) +{ + element.style.cssText = 'margin:0;' + + 'padding:0;' + + 'border:0;' + + 'background-color:transparent;' + + 'background-image:none;' ; +} Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 2064) @@ -71,6 +71,11 @@ sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ; - // Add a space in the tags with no closing tags, like
->
- sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />'); + // According to the doctype set the proper end for self-closing tags + // HTML:
+ // XHTML: Add a space, like
->
+ if (FCKConfig.DocType.length > 0 && FCKRegexLib.HtmlDocType.test( FCKConfig.DocType ) ) + sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, '>'); + else + sXHTML = sXHTML.replace( FCKRegexLib.SpaceNoClose, ' />'); if ( FCKConfig.ForceSimpleAmpersand ) @@ -401,4 +406,11 @@ FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ; + // Bug #768 : If the width and height are defined inline CSS, + // don't define it again in the HTML attributes. + if ( htmlNode.style.width ) + node.removeAttribute( 'width' ) ; + if ( htmlNode.style.height ) + node.removeAttribute( 'height' ) ; + return node ; }, Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_gecko.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_gecko.js (revision 2064) @@ -100,2 +100,15 @@ } } + +if ( FCKBrowserInfo.IsGecko ) +{ + // #2162, some Firefox extensions might add references to internal links + FCKXHtml.TagProcessors['link'] = function( node, htmlNode ) + { + if ( htmlNode.href.substr(0, 9).toLowerCase() == 'chrome://' ) + return false ; + + return node ; + } + +} Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/common/fck_dialog_common.js (revision 2064) @@ -60,5 +60,5 @@ return ( prefix || '' ) + 'common/fck_dialog_common.css' ; // @Packager.RemoveLine /* @Packager.RemoveLine - // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor + // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt). return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ; @Packager.RemoveLine */ @@ -191,32 +191,5 @@ sOptions += ",top=" + iTop ; - // The "PreserveSessionOnFileBrowser" because the above code could be - // blocked by popup blockers. - if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE ) - { - // The following change has been made otherwise IE will open the file - // browser on a different server session (on some cases): - // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678 - // by Simone Chiaretta. - var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ; - - if ( oWindow ) - { - // Detect Yahoo popup blocker. - try - { - var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user. - oWindow.opener = window ; - } - catch(e) - { - alert( oEditor.FCKLang.BrowseServerBlocked ) ; - } - } - else - alert( oEditor.FCKLang.BrowseServerBlocked ) ; - } - else - window.open( url, 'FCKBrowseWindow', sOptions ) ; + window.open( url, 'FCKBrowseWindow', sOptions ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash.html (revision 2064) @@ -98,5 +98,5 @@ Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash/fck_flash.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash/fck_flash.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_flash/fck_flash.js (revision 2064) @@ -237,4 +237,8 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { @@ -289,4 +293,8 @@ } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image.html (revision 2064) @@ -166,5 +166,5 @@ Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image.js (revision 2064) @@ -448,4 +448,8 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { @@ -501,4 +505,8 @@ } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image_preview.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image_preview.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_image/fck_image_preview.html (revision 2064) @@ -35,7 +35,7 @@ var FCKConfig = window.parent.FCKConfig ; -// Sets the Skin CSS -document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ; -document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ; +// Set the preview CSS +document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) ) ; +document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaStyles ) ) ; if ( window.parent.FCKConfig.BaseHref.length > 0 ) @@ -51,5 +51,5 @@ - +
Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link.html (revision 2064) @@ -109,5 +109,7 @@
- +
Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link/fck_link.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link/fck_link.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_link/fck_link.js (revision 2064) @@ -651,5 +651,5 @@ function SetUrl( url ) { - document.getElementById('txtUrl').value = url ; + GetE('txtUrl').value = url ; OnUrlChange() ; dialog.SetSelectedTab( 'Info' ) ; @@ -658,4 +658,8 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { @@ -710,4 +714,8 @@ } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_listprop.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_listprop.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_listprop.html (revision 2064) @@ -68,5 +68,5 @@ dialog.SetAutoSize( true ) ; - SelectField( 'txtStartPosition' ) ; + SelectField( sListType == 'OL' ? 'txtStartPosition' : 'selBulleted' ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_replace.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_replace.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_replace.html (revision 2064) @@ -35,4 +35,10 @@ var FCKLang = oEditor.FCKLang ; +var FCKDomTools = oEditor.FCKDomTools ; +var FCKDomRange = oEditor.FCKDomRange ; +var FCKListsLib = oEditor.FCKListsLib ; +var FCKTools = oEditor.FCKTools ; +var EditorDocument = oEditor.FCK.EditorDocument ; +var HighlightStyle = oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ) ; dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ; @@ -52,180 +58,252 @@ } -// Place a range at the start of document. -// This will be the starting point of our search. -var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ; - -function ResetGlobalRange() -{ - GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ; - GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ; - GlobalRange.Collapse( true ) ; -} -ResetGlobalRange() ; - -var HighlightRange = null ; -function Highlight() -{ - if ( HighlightRange ) - ClearHighlight() ; - var cloneRange = GlobalRange.Clone() ; - oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ; - HighlightRange = cloneRange ; - GlobalRange = HighlightRange.Clone() ; -} - -function ClearHighlight() -{ - if ( HighlightRange ) - { - oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ; - HighlightRange = null ; - } -} - -function OnLoad() -{ - // First of all, translate the dialog box texts. - oEditor.FCKLanguageManager.TranslatePage( document ) ; - - // Show the appropriate tab at startup. - if ( dialogArguments.CustomValue == 'Find' ) - { - dialog.SetSelectedTab( 'Find' ) ; - dialog.SetAutoSize( true ) ; +GetNextNonEmptyTextNode = function( node, stopNode ) +{ + while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 ) + 1 ; + return node ; +} + +CharacterCursor = function( arg ) +{ + if ( arg.nodeType && arg.nodeType == 9 ) + { + this._textNode = GetNextNonEmptyTextNode( arg.body, arg.documentElement ) ; + this._offset = 0 ; + this._doc = arg ; } else - dialog.SetSelectedTab( 'Replace' ) ; - - SelectField( 'txtFind' + dialogArguments.CustomValue ) ; -} - -function btnStat() -{ - GetE('btnReplace').disabled = - GetE('btnReplaceAll').disabled = - GetE('btnFind').disabled = - ( GetE(idMap["FindText"]).value.length == 0 ) ; -} - -function btnStatDelayed() -{ - setTimeout( btnStat, 1 ) ; -} - -function GetSearchString() -{ - return GetE(idMap['FindText']).value ; -} - -function GetReplaceString() -{ - return GetE("txtReplace").value ; -} - -function GetCheckCase() -{ - return !! ( GetE(idMap['CheckCase']).checked ) ; -} - -function GetMatchWord() -{ - return !! ( GetE(idMap['CheckWord']).checked ) ; -} - -// Get the data pointed to by a bookmark. -function GetData( bookmark ) -{ - var cursor = oEditor.FCK.EditorDocument.documentElement ; - for ( var i = 0 ; i < bookmark.length ; i++ ) - { - var target = bookmark[i] ; - var currentIndex = -1 ; - if ( cursor.nodeType != 3 ) - { - for (var j = 0 ; j < cursor.childNodes.length ; j++ ) - { - var candidate = cursor.childNodes[j] ; - if ( candidate.nodeType == 3 && - candidate.previousSibling && - candidate.previousSibling.nodeType == 3 ) - continue ; - currentIndex++ ; - if ( currentIndex == target ) - { - cursor = candidate ; - break ; - } - } - if ( currentIndex < target ) - return null ; - } - else - { - if ( i != bookmark.length - 1 ) - return null ; - while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 ) - { - target -= cursor.length ; - cursor = cursor.nextSibling ; - } - cursor = cursor.nodeValue.charAt( target ) ; - if ( cursor == "" ) - cursor = null ; - } - } - return cursor ; -} - -// With this function, we can treat the bookmark as an iterator for DFS. -function NextPosition( bookmark ) -{ - // See if there's anything further down the tree. - var next = bookmark.concat( [0] ) ; - if ( GetData( next ) != null ) - return next ; - - // Nothing down there? See if there's anything next to me. - var next = bookmark.slice( 0, bookmark.length - 1 ).concat( [ bookmark[ bookmark.length - 1 ] + 1 ] ) ; - if ( GetData( next ) != null ) - return next ; - - // Nothing even next to me? See if there's anything next to my ancestors. - for ( var i = bookmark.length - 1 ; i > 0 ; i-- ) - { - var next = bookmark.slice( 0, i - 1 ).concat( [ bookmark[ i - 1 ] + 1 ] ) ; - if ( GetData( next ) != null ) - return next ; - } - - // There's absolutely nothing left to walk, return null. - return null ; -} - -// Is this character a unicode whitespace? -// Reference: http://unicode.org/Public/UNIDATA/PropList.txt -function CheckIsWhitespace( c ) -{ - var code = c.charCodeAt( 0 ); - if ( code >= 9 && code <= 0xd ) - return true; - if ( code >= 0x2000 && code <= 0x200a ) - return true; - switch ( code ) - { - case 0x20: - case 0x85: - case 0xa0: - case 0x1680: - case 0x180e: - case 0x2028: - case 0x2029: - case 0x202f: - case 0x205f: - case 0x3000: - return true; - default: - return false; - } + { + this._textNode = arguments[0] ; + this._offset = arguments[1] ; + this._doc = FCKTools.GetElementDocument( arguments[0] ) ; + } +} +CharacterCursor.prototype = +{ + GetCharacter : function() + { + return ( this._textNode && this._textNode.nodeValue.charAt( this._offset ) ) || null ; + }, + + // Non-normalized. + GetTextNode : function() + { + return this._textNode ; + }, + + // Non-normalized. + GetIndex : function() + { + return this._offset ; + }, + + // Return value means whehther we've crossed a line break or a paragraph boundary. + MoveNext : function() + { + if ( this._offset < this._textNode.length - 1 ) + { + this._offset++ ; + return false ; + } + + var crossed = false ; + var curNode = this._textNode ; + while ( ( curNode = FCKDomTools.GetNextSourceNode( curNode ) ) + && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) ) + { + var tag = curNode.nodeName.toLowerCase() ; + if ( FCKListsLib.BlockElements[tag] || tag == 'br' ) + crossed = true ; + } + + this._textNode = curNode ; + this._offset = 0 ; + return crossed ; + }, + + // Return value means whehther we've crossed a line break or a paragraph boundary. + MoveBack : function() + { + if ( this._offset > 0 && this._textNode.length > 0 ) + { + this._offset = Math.min( this._offset - 1, this._textNode.length - 1 ) ; + return false ; + } + + var crossed = false ; + var curNode = this._textNode ; + while ( ( curNode = FCKDomTools.GetPreviousSourceNode( curNode ) ) + && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) ) + { + var tag = curNode.nodeName.toLowerCase() ; + if ( FCKListsLib.BlockElements[tag] || tag == 'br' ) + crossed = true ; + } + + this._textNode = curNode ; + this._offset = curNode.length - 1 ; + return crossed ; + }, + + Clone : function() + { + return new CharacterCursor( this._textNode, this._offset ) ; + } +} ; + +CharacterRange = function( initCursor, maxLength ) +{ + this._cursors = initCursor.push ? initCursor : [initCursor] ; + this._maxLength = maxLength ; + this._highlightRange = null ; +} +CharacterRange.prototype = +{ + ToDomRange : function() + { + var firstCursor = this._cursors[0] ; + var lastCursor = this._cursors[ this._cursors.length - 1 ] ; + var domRange = new FCKDomRange( FCKTools.GetElementWindow( firstCursor.GetTextNode() ) ) ; + var w3cRange = domRange._Range = domRange.CreateRange() ; + w3cRange.setStart( firstCursor.GetTextNode(), firstCursor.GetIndex() ) ; + w3cRange.setEnd( lastCursor.GetTextNode(), lastCursor.GetIndex() + 1 ) ; + domRange._UpdateElementInfo() ; + return domRange ; + }, + + Highlight : function() + { + if ( this._cursors.length < 1 ) + return ; + + var domRange = this.ToDomRange() ; + HighlightStyle.ApplyToRange( domRange, false, true ) ; + this._highlightRange = domRange ; + + var charRange = CharacterRange.CreateFromDomRange( domRange ) ; + var focusNode = domRange.StartNode ; + if ( focusNode.nodeType != 1 ) + focusNode = focusNode.parentNode ; + focusNode.scrollIntoView( false ) ; + this._cursors = charRange._cursors ; + }, + + RemoveHighlight : function() + { + if ( this._highlightRange ) + { + HighlightStyle.RemoveFromRange( this._highlightRange, false, true ) ; + var charRange = CharacterRange.CreateFromDomRange( this._highlightRange ) ; + this._cursors = charRange._cursors ; + this._highlightRange = null ; + } + }, + + GetHighlightDomRange : function() + { + return this._highlightRange; + }, + + MoveNext : function() + { + var next = this._cursors[ this._cursors.length - 1 ].Clone() ; + var retval = next.MoveNext() ; + if ( retval ) + this._cursors = [] ; + this._cursors.push( next ) ; + if ( this._cursors.length > this._maxLength ) + this._cursors.shift() ; + return retval ; + }, + + MoveBack : function() + { + var prev = this._cursors[0].Clone() ; + var retval = prev.MoveBack() ; + if ( retval ) + this._cursors = [] ; + this._cursors.unshift( prev ) ; + if ( this._cursors.length > this._maxLength ) + this._cursors.pop() ; + return retval ; + }, + + GetEndCharacter : function() + { + if ( this._cursors.length < 1 ) + return null ; + var retval = this._cursors[ this._cursors.length - 1 ].GetCharacter() ; + return retval ; + }, + + GetNextRange : function( len ) + { + if ( this._cursors.length == 0 ) + return null ; + var cur = this._cursors[ this._cursors.length - 1 ].Clone() ; + cur.MoveNext() ; + return new CharacterRange( cur, len ) ; + }, + + GetCursors : function() + { + return this._cursors ; + } +} ; + +CharacterRange.CreateFromDomRange = function( domRange ) +{ + var w3cRange = domRange._Range ; + var startContainer = w3cRange.startContainer ; + var endContainer = w3cRange.endContainer ; + var startTextNode, startIndex, endTextNode, endIndex ; + + if ( startContainer.nodeType == 3 ) + { + startTextNode = startContainer ; + startIndex = w3cRange.startOffset ; + } + else if ( domRange.StartNode.nodeType == 3 ) + { + startTextNode = domRange.StartNode ; + startIndex = 0 ; + } + else + { + startTextNode = GetNextNonEmptyTextNode( domRange.StartNode, domRange.StartNode.parentNode ) ; + if ( !startTextNode ) + return null ; + startIndex = 0 ; + } + + if ( endContainer.nodeType == 3 && w3cRange.endOffset > 0 ) + { + endTextNode = endContainer ; + endIndex = w3cRange.endOffset - 1 ; + } + else + { + endTextNode = domRange.EndNode ; + while ( endTextNode.nodeType != 3 ) + endTextNode = endTextNode.lastChild ; + endIndex = endTextNode.length - 1 ; + } + + var cursors = [] ; + var current = new CharacterCursor( startTextNode, startIndex ) ; + cursors.push( current ) ; + if ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) && !domRange.CheckIsEmpty() ) + { + do + { + current = current.Clone() ; + current.MoveNext() ; + cursors.push( current ) ; + } + while ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) ) ; + } + + return new CharacterRange( cursors, cursors.length ) ; } @@ -234,5 +312,5 @@ KMP_ADVANCED = 1 ; KMP_MATCHED = 2 ; -function KmpMatch( pattern, ignoreCase ) +KmpMatch = function( pattern, ignoreCase ) { var overlap = [ -1 ] ; @@ -252,5 +330,5 @@ } KmpMatch.prototype = { - "FeedCharacter" : function( c ) + FeedCharacter : function( c ) { if ( this._IgnoreCase ) @@ -278,5 +356,6 @@ return null ; }, - "Reset" : function() + + Reset : function() { this._State = 0 ; @@ -284,152 +363,178 @@ }; +// Place a range at the start of document. +function OnLoad() +{ + // First of all, translate the dialog box texts. + oEditor.FCKLanguageManager.TranslatePage( document ) ; + + // Show the appropriate tab at startup. + if ( dialogArguments.CustomValue == 'Find' ) + { + dialog.SetSelectedTab( 'Find' ) ; + dialog.SetAutoSize( true ) ; + } + else + dialog.SetSelectedTab( 'Replace' ) ; + + SelectField( 'txtFind' + dialogArguments.CustomValue ) ; +} + +function btnStat() +{ + GetE('btnReplace').disabled = + GetE('btnReplaceAll').disabled = + GetE('btnFind').disabled = + ( GetE(idMap["FindText"]).value.length == 0 ) ; +} + +function btnStatDelayed() +{ + setTimeout( btnStat, 1 ) ; +} + +function GetSearchString() +{ + return GetE(idMap['FindText']).value ; +} + +function GetReplaceString() +{ + return GetE("txtReplace").value ; +} + +function GetCheckCase() +{ + return !! ( GetE(idMap['CheckCase']).checked ) ; +} + +function GetMatchWord() +{ + return !! ( GetE(idMap['CheckWord']).checked ) ; +} + +/* Is this character a unicode whitespace or a punctuation mark? + * References: + * http://unicode.org/Public/UNIDATA/PropList.txt (whitespaces) + * http://php.chinaunix.net/manual/tw/ref.regex.php (punctuation marks) + */ +function CheckIsWordSeparator( c ) +{ + var code = c.charCodeAt( 0 ); + if ( code >= 9 && code <= 0xd ) + return true; + if ( code >= 0x2000 && code <= 0x200a ) + return true; + switch ( code ) + { + case 0x20: + case 0x85: + case 0xa0: + case 0x1680: + case 0x180e: + case 0x2028: + case 0x2029: + case 0x202f: + case 0x205f: + case 0x3000: + return true; + default: + } + return /[.,"'?!;:]/.test( c ) ; +} + +FindRange = null ; function _Find() { - // Start from the end of the current selection. - var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ; - var cursor = GlobalRange.CreateBookmark2().End ; + var searchString = GetSearchString() ; + if ( !FindRange ) + FindRange = new CharacterRange( new CharacterCursor( EditorDocument ), searchString.length ) ; + else + { + FindRange.RemoveHighlight() ; + FindRange = FindRange.GetNextRange( searchString.length ) ; + } + var matcher = new KmpMatch( searchString, ! GetCheckCase() ) ; var matchState = KMP_NOMATCH ; - var matchBookmark = null ; - var matchBookmarkStart = [] ; - - // Match finding. - while ( true ) - { - // Perform KMP stream matching. - // - Reset KMP matcher if we encountered a block element. - var data = GetData( cursor ) ; - if ( data ) - { - if ( data.tagName ) + var character = '%' ; + + while ( character != null ) + { + while ( ( character = FindRange.GetEndCharacter() ) ) + { + matchState = matcher.FeedCharacter( character ) ; + if ( matchState == KMP_MATCHED ) + break ; + if ( FindRange.MoveNext() ) + matcher.Reset() ; + } + + if ( matchState == KMP_MATCHED ) + { + if ( GetMatchWord() ) { - if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] ) - { - matcher.Reset(); - matchBookmarkStart = [] ; - } + var cursors = FindRange.GetCursors() ; + var head = cursors[ cursors.length - 1 ].Clone() ; + var tail = cursors[0].Clone() ; + if ( !head.MoveNext() && !CheckIsWordSeparator( head.GetCharacter() ) ) + continue ; + if ( !tail.MoveBack() && !CheckIsWordSeparator( tail.GetCharacter() ) ) + continue ; } - else if ( data.charAt != undefined ) - { - matchState = matcher.FeedCharacter(data) ; - - // No possible match of any useful substring in the pattern for the currently scanned character. - // So delete any positional information. - if ( matchState == KMP_NOMATCH ) - matchBookmarkStart = [] ; - // We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later. - else if ( matchState == KMP_ADVANCED ) - { - matchBookmarkStart.push( cursor.concat( [] ) ) ; - if ( matchBookmarkStart.length > matcher._State ) - matchBookmarkStart.shift() ; - } - // Found a complete match! Mark down the ending position as well. - else if ( matchState == KMP_MATCHED ) - { - // It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character. - // So need to check and mark down the starting position as well. - if ( matchBookmarkStart.length == 0 ) - matchBookmarkStart = [cursor.concat( [] )] ; - - matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ; - matchBookmark.End[ matchBookmark.End.length - 1 ]++; - - // Wait, do we have to match a whole word? - // If yes, carry out additional checks on what we've got. - if ( GetMatchWord() ) - { - var startOk = false ; - var endOk = false ; - var start = matchBookmark.Start ; - var end = matchBookmark.End ; - if ( start[ start.length - 1 ] == 0 ) - startOk = true ; - else - { - var cursorBeforeStart = start.slice( 0, start.length - 1 ) ; - cursorBeforeStart.push( start[ start.length - 1 ] - 1 ) ; - var dataBeforeStart = GetData( cursorBeforeStart ) ; - if ( dataBeforeStart == null || dataBeforeStart.charAt == undefined ) - startOk = true ; - else if ( CheckIsWhitespace( dataBeforeStart ) ) - startOk = true ; - } - - // this is already one character beyond the last char, no need to move - var cursorAfterEnd = end ; - var dataAfterEnd = GetData( cursorAfterEnd ); - if ( dataAfterEnd == null || dataAfterEnd.charAt == undefined ) - endOk = true ; - else if ( CheckIsWhitespace( dataAfterEnd ) ) - endOk = true ; - - if ( startOk && endOk ) - break ; - else - matcher.Reset() ; - } - else - break ; - } - } - } - - // Perform DFS across the document, until we've reached the end. - cursor = NextPosition( cursor ) ; - if ( cursor == null ) - break; - } - - // If we've found a match, highlight the match. - if ( matchState == KMP_MATCHED ) - { - GlobalRange.MoveToBookmark2( matchBookmark ) ; - Highlight() ; - var focus = GlobalRange._Range.endContainer ; - while ( focus && focus.nodeType != 1 ) - focus = focus.parentNode ; - - if ( focus ) - { - if ( oEditor.FCKBrowserInfo.IsSafari ) - oEditor.FCKDomTools.ScrollIntoView( focus, false ) ; - else - focus.scrollIntoView( false ) ; - } - - return true ; + + FindRange.Highlight() ; + return true ; + } + } + + FindRange = null ; + return false ; +} + +function Find() +{ + if ( ! _Find() ) + alert( FCKLang.DlgFindNotFoundMsg ) ; +} + +function Replace() +{ + var saveUndoStep = function( selectRange ) + { + var ieRange ; + if ( oEditor.FCKBrowserInfo.IsIE ) + ieRange = document.selection.createRange() ; + + selectRange.Select() ; + oEditor.FCKUndo.SaveUndoStep() ; + var cloneRange = selectRange.Clone() ; + cloneRange.Collapse( false ) ; + cloneRange.Select() ; + + if ( ieRange ) + setTimeout( function(){ ieRange.select() ; }, 1 ) ; + } + + if ( FindRange && FindRange.GetHighlightDomRange() ) + { + var range = FindRange.GetHighlightDomRange() ; + var bookmark = range.CreateBookmark() ; + FindRange.RemoveHighlight() ; + range.MoveToBookmark( bookmark ) ; + + saveUndoStep( range ) ; + range.DeleteContents() ; + range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ; + range._UpdateElementInfo() ; + + FindRange = CharacterRange.CreateFromDomRange( range ) ; } else { - ResetGlobalRange() ; - return false ; - } -} - -function Find() -{ - if ( ! _Find() ) - { - ClearHighlight() ; - alert( FCKLang.DlgFindNotFoundMsg ) ; - } -} - -function Replace() -{ - if ( GlobalRange.CheckIsCollapsed() ) - { - if (! _Find() ) - { - ClearHighlight() ; + if ( ! _Find() ) + { + FindRange && FindRange.RemoveHighlight() ; alert( FCKLang.DlgFindNotFoundMsg ) ; } - } - else - { - oEditor.FCKUndo.SaveUndoStep() ; - GlobalRange.DeleteContents() ; - GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ; - GlobalRange.Collapse( false ) ; } } @@ -442,13 +547,19 @@ while ( _Find() ) { - dialog.Selection.EnsureSelection() ; - GlobalRange.DeleteContents() ; - GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ; - GlobalRange.Collapse( false ) ; + var range = FindRange.GetHighlightDomRange() ; + var bookmark = range.CreateBookmark() ; + FindRange.RemoveHighlight() ; + range.MoveToBookmark( bookmark) ; + + range.DeleteContents() ; + range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ; + range._UpdateElementInfo() ; + + FindRange = CharacterRange.CreateFromDomRange( range ) ; replaceCount++ ; } if ( replaceCount == 0 ) { - ClearHighlight() ; + FindRange && FindRange.RemoveHighlight() ; alert( FCKLang.DlgFindNotFoundMsg ) ; } @@ -456,5 +567,12 @@ } -window.onunload = function(){ ClearHighlight() ; } +window.onunload = function() +{ + if ( FindRange ) + { + FindRange.RemoveHighlight() ; + FindRange.ToDomRange().Select() ; + } +} Index: /FCKeditor/branches/versions/2.6.x/editor/fckdialog.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/fckdialog.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/fckdialog.html (revision 2064) @@ -28,4 +28,6 @@ @@ -735,5 +760,7 @@
@@ -773,4 +800,5 @@ Index: /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html (revision 2064) @@ -241,6 +241,6 @@ var FCK_ShowTableBordersCSS = FCKConfig.FullBasePath + 'css/fck_showtableborders_gecko.css' ; // @Packager.RemoveLine /* @Packager.RemoveLine -// CSS minified by http://iceyboard.no-ip.org/projects/css_compressor -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__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)}' ) ; +// 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}' ) ; @Packager.RemoveLine */ Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.css =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.css (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.css (revision 2064) @@ -25,10 +25,12 @@ { background-color: #f1f1e3; + margin-top:0; + margin-bottom:0; } form { - margin: 0px 0px 0px 0px ; - padding: 0px 0px 0px 0px ; + margin: 0; + padding: 0; } @@ -36,14 +38,9 @@ { background-color: #f1f1e3; - border-color: #f1f1e3; - border-right: thin inset; - border-top: thin inset; - border-left: thin inset; - border-bottom: thin inset; + border: thin inset #f1f1e3; } body.FileArea { - background-color: #ffffff; margin: 10px; @@ -71,9 +68,6 @@ .Button, button { - border-right: #737357 1px solid; - border-top: #737357 1px solid; - border-left: #737357 1px solid; color: #3b3b1f; - border-bottom: #737357 1px solid; + border: #737357 1px solid; background-color: #c7c78f; } @@ -88,2 +82,6 @@ background-image: url(images/Folder.gif); } + +.fullHeight { + height: 100%; +} Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/browser.html (revision 2064) @@ -1,3 +1,4 @@ - + - + - + Resources + Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourcetype.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourcetype.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourcetype.html (revision 2064) @@ -24,8 +24,9 @@ + Available types - - -
Field NameValue
%s%s%s
%s
+ +
Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmupload.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmupload.html (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmupload.html (revision 2064) @@ -22,9 +22,9 @@ * Page used to upload new files in the current folder. --> - + File Upload - + - +
-
Resource Type
+
Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/js/common.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/js/common.js (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/js/common.js (revision 2064) @@ -36,5 +36,8 @@ break ; } - catch( e ) {} + catch( e ) + { + break ; + } // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ... Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp (revision 2064) @@ -31,4 +31,5 @@ ' Set the response format. + Response.CodePage = 65001 Response.CharSet = "UTF-8" Response.ContentType = "text/xml" Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/commands.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/commands.asp (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/commands.asp (revision 2064) @@ -104,5 +104,5 @@ ' Map the virtual path to the local server path of the current folder. Dim sServerDir - sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" ) + sServerDir = ServerMapFolder( resourceType, CombineLocalPaths(currentFolder, sNewFolderName), "CreateFolder" ) On Error Resume Next @@ -172,5 +172,5 @@ Do While ( True ) Dim sFilePath - sFilePath = sServerDir & sFileName + sFilePath = CombineLocalPaths(sServerDir, sFileName) If ( oFSO.FileExists( sFilePath ) ) Then Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/io.asp (revision 2064) @@ -24,4 +24,10 @@ function CombinePaths( sBasePath, sFolder) CombinePaths = RemoveFromEnd( sBasePath, "/" ) & "/" & RemoveFromStart( sFolder, "/" ) +end function + +function CombineLocalPaths( sBasePath, sFolder) + sFolder = replace(sFolder, "/", "\") + ' The RemoveFrom* functions use RegExp, so we must escape the \ + CombineLocalPaths = RemoveFromEnd( sBasePath, "\\" ) & "\" & RemoveFromStart( sFolder, "\\" ) end function @@ -70,5 +76,5 @@ ' Return the resource type directory combined with the required path. - ServerMapFolder = CombinePaths( sResourceTypePath, folderPath ) + ServerMapFolder = CombineLocalPaths( sResourceTypePath, folderPath ) End Function @@ -79,4 +85,8 @@ Dim sParent sParent = oFSO.GetParentFolderName( folderPath ) + + ' If folderPath is a network path (\\server\folder\) then sParent is an empty string. + ' Get out. + if (sParent = "") then exit sub ' Check if the parent exists, or create it. @@ -215,35 +225,7 @@ Response.Clear Response.Write "'); Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_io.cfm (revision 2064) @@ -266,39 +266,11 @@ + +(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); +window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" ); + Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso (revision 2063) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/lasso/upload.lasso (revision 2064) @@ -75,36 +75,13 @@ -description='Sets the HTML response for the FCKEditor Quick Upload feature.' ); - $__html_reply__ = '\ -