Index: /FCKeditor/trunk/_dev/_getopt.php =================================================================== --- /FCKeditor/trunk/_dev/_getopt.php (revision 1563) +++ /FCKeditor/trunk/_dev/_getopt.php (revision 1564) @@ -74,5 +74,5 @@ * Preserved for backwards compatibility. * @see getopt2() - */ + */ function getopt($args, $short_options, $long_options = null) { Index: /FCKeditor/trunk/_dev/browserbugs/firefox/iframe_table_rendering.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/firefox/iframe_table_rendering.html (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/firefox/iframe_table_rendering.html (revision 1564) @@ -34,5 +34,5 @@ oDoc.open() ; oDoc.write( BuildHtml() ) ; - oDoc.close() ; + oDoc.close() ; } @@ -48,10 +48,10 @@ sHtml += '<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type">' ; sHtml += '<\/head><body>' ; - + sHtml += '<div style="font-size:10px; font-family:Verdana"> Text outside the table'; sHtml += '<table border="1"><tr><td>Text in the table<\/td><\/tr><\/table>'; sHtml += 'If this is rendered in standards mode the text size inside the table will be the same as this one.'; sHtml += '<\/div>'; - + sHtml += '<\/body><\/html>' ; Index: /FCKeditor/trunk/_dev/browserbugs/opera/fck_editor.css =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/opera/fck_editor.css (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/opera/fck_editor.css (revision 1564) Index: /FCKeditor/trunk/_dev/browserbugs/safari/1462_2_reduced.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/1462_2_reduced.html (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/1462_2_reduced.html (revision 1564) @@ -24,5 +24,5 @@ doc.close() ; - + // Start editing on it. doc.designMode = 'on' ; @@ -33,12 +33,12 @@ // Get the element to which we want the caret blinking inside. var p = window.frames[ 'xEditorArea' ].document.getElementById( 'xHidden' ) ; - + // Move the selection to the start of the <p id="xHidden"> contents. var sel = win.getSelection(); - + var range = document.createRange(); range.selectNodeContents( p ); range.collapse( true ); - + sel.removeAllRanges() ; sel.addRange( range ) ; Index: /FCKeditor/trunk/_dev/browserbugs/safari/1462_reduced.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/1462_reduced.html (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/1462_reduced.html (revision 1564) @@ -63,6 +63,6 @@ </iframe> <p> - The above IFRAME constains a yellow and a red DIV elements. By clicking the - following button, only the IFRAME should scroll to show the red DIV, + The above IFRAME constains a yellow and a red DIV elements. By clicking the + following button, only the IFRAME should scroll to show the red DIV, while the main window should stay at the same position. </p> Index: /FCKeditor/trunk/_dev/browserbugs/safari/hr_undefined.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/hr_undefined.html (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/hr_undefined.html (revision 1564) @@ -8,10 +8,10 @@ { document.designMode = 'on' ; - + // This alert is here just to place the focus in the editable document. - alert( 'Click OK to insert the <hr>' ) ; + alert( 'Click OK to insert the <hr>' ) ; document.execCommand( 'InsertHorizontalRule' ) ; - + alert( 'The resulting HTML is: \n' + document.body.innerHTML + '\nThe desired HTML is:\n<hr />' ) ; } Index: /FCKeditor/trunk/_dev/browserbugs/safari/iframepath/iframe/styles.css =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/iframepath/iframe/styles.css (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/iframepath/iframe/styles.css (revision 1564) Index: /FCKeditor/trunk/_dev/browserbugs/safari/loadscript/test.js =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/loadscript/test.js (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/loadscript/test.js (revision 1564) Index: /FCKeditor/trunk/_dev/browserbugs/safari/loadscript2/test.js =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/loadscript2/test.js (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/loadscript2/test.js (revision 1564) Index: /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_removeformat.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_removeformat.html (revision 1563) +++ /FCKeditor/trunk/_dev/browserbugs/safari/nbsp_removeformat.html (revision 1564) @@ -8,5 +8,5 @@ { document.designMode = 'on' ; - + var original = escape(document.body.innerHTML) ; @@ -14,5 +14,5 @@ document.execCommand( 'RemoveFormat', false, null ) ; - + alert( 'Escaped contents\nOriginal: \n\t' + original + '\nAfter removeformat: \n\t' + escape(document.body.innerHTML) ) ; } Index: /FCKeditor/trunk/_dev/build_release.bat =================================================================== --- /FCKeditor/trunk/_dev/build_release.bat (revision 1563) +++ /FCKeditor/trunk/_dev/build_release.bat (revision 1564) Index: /FCKeditor/trunk/_dev/fckreleaser.xml =================================================================== --- /FCKeditor/trunk/_dev/fckreleaser.xml (revision 1563) +++ /FCKeditor/trunk/_dev/fckreleaser.xml (revision 1564) @@ -27,5 +27,5 @@ <IgnoreDir path="_test" /> <IgnoreDir path="_testcases" /> - + <!-- The following directory should not existing in the development version, Index: /FCKeditor/trunk/_dev/fixlineends.php =================================================================== --- /FCKeditor/trunk/_dev/fixlineends.php (revision 1563) +++ /FCKeditor/trunk/_dev/fixlineends.php (revision 1564) @@ -75,5 +75,5 @@ $list["py"] = CRLF; $list["sample"] = CRLF; -$list["sh"] = CRLF; +$list["sh"] = LF; $list["txt"] = CRLF; $list["xml"] = CRLF; Index: /FCKeditor/trunk/_dev/lint.bat =================================================================== --- /FCKeditor/trunk/_dev/lint.bat (revision 1563) +++ /FCKeditor/trunk/_dev/lint.bat (revision 1564) @@ -40,3 +40,2 @@ :End - Index: /FCKeditor/trunk/_dev/lint.sh =================================================================== --- /FCKeditor/trunk/_dev/lint.sh (revision 1563) +++ /FCKeditor/trunk/_dev/lint.sh (revision 1564) @@ -1,3 +1,3 @@ -# +# # FCKeditor - The text editor for Internet - http://www.fckeditor.net # Copyright (C) 2003-2007 Frederico Caldeira Knabben @@ -29,5 +29,5 @@ # -if [ "$1" = "" ] +if [ "$1" = "" ] then ./bin/jsl -conf lint.mac.conf -nofilelisting -nologo @@ -35,6 +35,5 @@ echo Generating $1 ... ./bin/jsl -conf lint.mac.conf -nofilelisting -nologo > $1 - echo + echo echo Process completed. fi - Index: /FCKeditor/trunk/_dev/lint_report.command =================================================================== --- /FCKeditor/trunk/_dev/lint_report.command (revision 1563) +++ /FCKeditor/trunk/_dev/lint_report.command (revision 1564) @@ -1,5 +1,5 @@ #!/bin/sh -# +# # FCKeditor - The text editor for Internet - http://www.fckeditor.net # Copyright (C) 2003-2007 Frederico Caldeira Knabben @@ -25,5 +25,5 @@ # Changes he path to match the current script and then calls lint script # to output the results in lint_report.txt -# Both this file and lint.sh must have execute permissions. +# Both this file and lint.sh must have execute permissions. # chmod +x lint.sh lint_report.command # Index: /FCKeditor/trunk/_dev/php_bom_finder.php =================================================================== --- /FCKeditor/trunk/_dev/php_bom_finder.php (revision 1563) +++ /FCKeditor/trunk/_dev/php_bom_finder.php (revision 1564) @@ -33,5 +33,5 @@ PHP Files with UTF-8 BOM</h1> <p> - + <?php @@ -43,5 +43,5 @@ { $counter = 0 ; - + $sourceDir = FixDirSlash( $sourceDir ) ; @@ -51,5 +51,5 @@ while ( $file = readdir( $sourceDirHandler ) ) { - // Skip ".", ".." and hidden fields (Unix). + // Skip ".", ".." and hidden fields (Unix). if ( substr( $file, 0, 1 ) == '.' ) continue ; @@ -61,13 +61,13 @@ $counter += CheckDir( $sourcefilePath ) ; } - + if ( !is_file( $sourcefilePath ) || @GetFileExtension( $sourcefilePath ) != 'php' || !CheckUtf8Bom( $sourcefilePath ) ) continue ; - + echo $sourcefilePath, '<br />' ; - + $counter++ ; } - + return $counter ; } @@ -76,8 +76,8 @@ { $dirPath = str_replace( '\\', '/', $dirPath ) ; - + if ( substr( $dirPath, -1, 1 ) != '/' ) $dirPath .= '/' ; - + return $dirPath ; } Index: /FCKeditor/trunk/_dev/releaser/fckreleaser.php =================================================================== --- /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 1563) +++ /FCKeditor/trunk/_dev/releaser/fckreleaser.php (revision 1564) @@ -82,8 +82,8 @@ { $dirPath = str_replace( '\\', '/', $dirPath ) ; - + if ( substr( $dirPath, -1, 1 ) != '/' ) $dirPath .= '/' ; - + return $dirPath ; } @@ -170,5 +170,5 @@ if ( isset( $releaseNode->Children[ 'IGNOREFILE' ] ) ) { - $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ; + $ignoreNodes = $releaseNode->Children[ 'IGNOREFILE' ] ; foreach ( $ignoreNodes as $ignoreNode ) { @@ -181,8 +181,8 @@ if ( isset( $releaseNode->Children[ 'ORIGINALFILE' ] ) ) { - $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ; + $originalNodes = $releaseNode->Children[ 'ORIGINALFILE' ] ; foreach ( $originalNodes as $originalNode ) { - $this->OriginalFiles[] = (object)array( + $this->OriginalFiles[] = (object)array( 'Source' => $originalNode->Attributes[ 'SOURCEPATH' ], 'Target' => $originalNode->Attributes[ 'TARGETPATH' ] ) ; @@ -239,5 +239,5 @@ while ( $file = readdir( $sourceDirHandler ) ) { - // Skip ".", ".." and hidden fields (Unix). + // Skip ".", ".." and hidden fields (Unix). if ( substr( $file, 0, 1 ) == '.' ) continue ; @@ -327,7 +327,7 @@ // Project start time (registration at SourceForge, actually = 2003-03-01 18:20). $startTime = gmmktime( 18, 20, 0, 3, 1, 2003 ) ; - + $currentTime = time() ; - + // Get the number of seconds since the project startup. $seconds = $currentTime - $startTime ; Index: /FCKeditor/trunk/_dev/releaser/license.txt =================================================================== --- /FCKeditor/trunk/_dev/releaser/license.txt (revision 1563) +++ /FCKeditor/trunk/_dev/releaser/license.txt (revision 1564) @@ -1245,3 +1245,2 @@ use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - Index: /FCKeditor/trunk/_dev/svn_update.bat =================================================================== --- /FCKeditor/trunk/_dev/svn_update.bat (revision 1563) +++ /FCKeditor/trunk/_dev/svn_update.bat (revision 1564) Index: /FCKeditor/trunk/_dev/update_lang.bat =================================================================== --- /FCKeditor/trunk/_dev/update_lang.bat (revision 1563) +++ /FCKeditor/trunk/_dev/update_lang.bat (revision 1564) @@ -22,5 +22,5 @@ :: :: This batch will update all language files found in the "editor/lang" folder, -:: marking all missing entries with "//MISSING" and updating the +:: marking all missing entries with "//MISSING" and updating the :: "_translationstatus.txt" file. :: Index: /FCKeditor/trunk/_samples/_plugins/findreplace/fckplugin.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/fckplugin.js (revision 1563) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/fckplugin.js (revision 1564) Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js (revision 1563) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js (revision 1564) Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js (revision 1563) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js (revision 1564) Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js (revision 1563) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js (revision 1564) Index: /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js (revision 1563) +++ /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js (revision 1564) Index: /FCKeditor/trunk/_samples/afp/fck.afpa =================================================================== --- /FCKeditor/trunk/_samples/afp/fck.afpa (revision 1563) +++ /FCKeditor/trunk/_samples/afp/fck.afpa (revision 1564) Index: /FCKeditor/trunk/_samples/afp/fck.afpa.code =================================================================== --- /FCKeditor/trunk/_samples/afp/fck.afpa.code (revision 1563) +++ /FCKeditor/trunk/_samples/afp/fck.afpa.code (revision 1564) @@ -164,3 +164,2 @@ ENDDEFINE - Index: /FCKeditor/trunk/_samples/afp/sample02.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sample02.afp (revision 1563) +++ /FCKeditor/trunk/_samples/afp/sample02.afp (revision 1564) @@ -18,5 +18,5 @@ * * == END LICENSE == - * + * * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) * Index: /FCKeditor/trunk/_samples/asp/sample02.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample02.asp (revision 1563) +++ /FCKeditor/trunk/_samples/asp/sample02.asp (revision 1564) Index: /FCKeditor/trunk/_samples/asp/sample03.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample03.asp (revision 1563) +++ /FCKeditor/trunk/_samples/asp/sample03.asp (revision 1564) Index: /FCKeditor/trunk/_samples/asp/sample04.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample04.asp (revision 1563) +++ /FCKeditor/trunk/_samples/asp/sample04.asp (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample01.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample01.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample01.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample01_mx.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample01_mx.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample01_mx.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample02.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample02.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample02.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample02_mx.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample02_mx.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample02_mx.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample03.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample03.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample03.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample03_mx.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample03_mx.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample03_mx.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample04.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample04.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample04.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/cfm/sample04_mx.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample04_mx.cfm (revision 1563) +++ /FCKeditor/trunk/_samples/cfm/sample04_mx.cfm (revision 1564) Index: /FCKeditor/trunk/_samples/perl/sample01.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample01.cgi (revision 1563) +++ /FCKeditor/trunk/_samples/perl/sample01.cgi (revision 1564) Index: /FCKeditor/trunk/_samples/perl/sample02.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample02.cgi (revision 1563) +++ /FCKeditor/trunk/_samples/perl/sample02.cgi (revision 1564) Index: /FCKeditor/trunk/_samples/perl/sample03.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample03.cgi (revision 1563) +++ /FCKeditor/trunk/_samples/perl/sample03.cgi (revision 1564) Index: /FCKeditor/trunk/_samples/perl/sample04.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample04.cgi (revision 1563) +++ /FCKeditor/trunk/_samples/perl/sample04.cgi (revision 1564) Index: /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi (revision 1563) +++ /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi (revision 1564) Index: /FCKeditor/trunk/_samples/php/sample01.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample01.php (revision 1563) +++ /FCKeditor/trunk/_samples/php/sample01.php (revision 1564) Index: /FCKeditor/trunk/_samples/php/sample02.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample02.php (revision 1563) +++ /FCKeditor/trunk/_samples/php/sample02.php (revision 1564) Index: /FCKeditor/trunk/_samples/php/sample03.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample03.php (revision 1563) +++ /FCKeditor/trunk/_samples/php/sample03.php (revision 1564) Index: /FCKeditor/trunk/_samples/php/sample04.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample04.php (revision 1563) +++ /FCKeditor/trunk/_samples/php/sample04.php (revision 1564) Index: /FCKeditor/trunk/_samples/py/sample01.py =================================================================== --- /FCKeditor/trunk/_samples/py/sample01.py (revision 1563) +++ /FCKeditor/trunk/_samples/py/sample01.py (revision 1564) @@ -79,4 +79,2 @@ </html> """ - - Index: /FCKeditor/trunk/_samples/sample.css =================================================================== --- /FCKeditor/trunk/_samples/sample.css (revision 1563) +++ /FCKeditor/trunk/_samples/sample.css (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/css/jsUnitStyle.css =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/css/jsUnitStyle.css (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/css/jsUnitStyle.css (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/emptyPage.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/emptyPage.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/emptyPage.html (revision 1564) @@ -9,3 +9,2 @@ </body> </html> - Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js (revision 1564) @@ -42,3 +42,2 @@ xbDebugTraceObject('window', 'jsUnitTestSuite'); } - Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts-errors.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts-errors.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts-errors.html (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/main-counts.html (revision 1564) @@ -19,3 +19,2 @@ </frameset> </html> - Index: /FCKeditor/trunk/_test/automated/_jsunit/app/testContainerController.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/testContainerController.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/testContainerController.html (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-firefox.sh =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-firefox.sh (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-firefox.sh (revision 1564) @@ -5,3 +5,2 @@ osascript bin/mac/stop-firefox.scpt osascript bin/mac/start-firefox.scpt $1 - Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-safari.sh =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-safari.sh (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/start-safari.sh (revision 1564) @@ -5,3 +5,2 @@ osascript bin/mac/stop-safari.scpt osascript bin/mac/start-safari.scpt $1 - Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-firefox.sh =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-firefox.sh (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-firefox.sh (revision 1564) @@ -4,3 +4,2 @@ osascript bin/mac/stop-firefox.scpt - Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-safari.sh =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-safari.sh (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/stop-safari.sh (revision 1564) @@ -4,3 +4,2 @@ osascript bin/mac/stop-safari.scpt - Index: /FCKeditor/trunk/_test/automated/_jsunit/changelog.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/changelog.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/changelog.txt (revision 1564) @@ -58,3 +58,2 @@ ECLIPSE PLUGIN - Eclipse plugin version 1.0 - Index: /FCKeditor/trunk/_test/automated/_jsunit/css/jsUnitStyle.css =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/css/jsUnitStyle.css (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/css/jsUnitStyle.css (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/index.jsp =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/index.jsp (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/index.jsp (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/jsunit.properties.sample =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/jsunit.properties.sample (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/jsunit.properties.sample (revision 1564) @@ -1,35 +1,34 @@ - + #Using jsunit.properties is one way to specify the various properties used by the JsUnitServer. #It is deprecated in favor of using ant build files. See build.xml. #To use this file, rename it to "jsunit.properties". You need to provide values for the mandatory properties. #See the documentation at http://www.jsunit.net for more information. - - + + #closeBrowsersAfterTestRuns determines whether to attempt to close browsers after test runs. This is not a mandatory property. The default is true. For example: 'true' closeBrowsersAfterTestRuns= - + #description is a human-readable description of a standard or farm server. This is not a mandatory property. The default is blank. For example: 'This is our Mac - it's only running Safari right now' description= - + #ignoreUnresponsiveRemoteMachines is a property used only by the JsUnit Farm Server and the distributed_test target. Its value is whether to ignore a remove machine that does not respond. If true, test runs will be green even if one or more remove machines fail to respond; if false, an unresponsive remove machine results in a failure. This is not a mandatory property. Its default is false. For example: 'true' ignoreUnresponsiveRemoteMachines= - + #logsDirectory is the directory in which the JsUnitStandardServer stores the XML logs produced from tests run. It can be specified relative to the working directory. This is not a mandatory property. If not specified, the directory called 'logs' inside resourceBase is assumed. For example: 'c:\jsunit\java\logs' logsDirectory= - + #port is the port on which the JsUnitStandardServer runs. This is not a mandatory property. If not specified, 8080 is assumed. For exapmle: '8080' port= - + #remoteMachineURLs is a property used only by the JsUnit Farm Server and the distributed_test target. Its value is the list of URLs of remove machines to which a request to run tests will be sent. For example: 'http://machine1.company.com:8080,http://localhost:8080,http://192.168.1.200:9090' remoteMachineURLs= - + #resourceBase is the directory that the JsUnitStandardServer considers to be its document root. It can be specified relative to the working directory. This is not a mandatory property. If not specified, the working directory is assumed. For example: 'c:\jsunit' resourceBase= - + #timeoutSeconds is the number of seconds to wait before timing out a browser during a test run. This is not a mandatory property. If not specified, 60 is assumed. For example: '60' timeoutSeconds= - + #url is the URL (HTTP or file protocol) to open in the browser. For a JsUnit Server, this is a mandatory property for a test run if the server is not passed the 'url' parameter. For example: 'file:///c:/jsunit/testRunner.html?testPage=c:/jsunit/tests/jsUnitTestSuite.html' url= - Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt (revision 1564) @@ -54,3 +54,2 @@ */ - Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/Jetty_license.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/Jetty_license.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/Jetty_license.html (revision 1564) @@ -210,4 +210,2 @@ on <a href=http://www.opensource.org>http://www.opensource.com</a></font></center> </FONT> - - Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/MPL-1.1.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/MPL-1.1.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/MPL-1.1.txt (revision 1564) @@ -468,3 +468,2 @@ use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] - Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/index.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/index.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/index.html (revision 1564) @@ -139,3 +139,2 @@ </body> </html> - Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt (revision 1564) @@ -510,4 +510,2 @@ That's all there is to it! - - Index: /FCKeditor/trunk/_test/automated/_jsunit/readme.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/readme.txt (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/readme.txt (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/testRunner.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/testRunner.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/testRunner.html (revision 1564) Index: /FCKeditor/trunk/_test/automated/_jsunit/tests/data/staff.dtd =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/tests/data/staff.dtd (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/tests/data/staff.dtd (revision 1564) @@ -15,3 +15,2 @@ <!ATTLIST entElement domestic CDATA "MALE" > - Index: /FCKeditor/trunk/_test/automated/_jsunit/tests/jsUnitMockTimeoutTest.html =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/tests/jsUnitMockTimeoutTest.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/_jsunit/tests/jsUnitMockTimeoutTest.html (revision 1564) Index: /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/tests/fckdataprocessor.html (revision 1564) @@ -28,5 +28,5 @@ <script type="text/javascript"> -var FCK = +var FCK = { IsDirty : function() { return true ; } Index: /FCKeditor/trunk/_test/automated/tests/fckdomrange.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 1563) +++ /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 1564) @@ -540,5 +540,5 @@ range.Expand( 'inline_elements' ) ; - + var innerRange = range._Range ; @@ -553,12 +553,12 @@ { var textNode = document.getElementById('_B1').childNodes[2] ; - + var range = new FCKDomRange( window ) ; range.MoveToNodeContents( textNode ) ; range.Expand( 'inline_elements' ) ; - + var innerRange = range._Range ; - + assertEquals( 'startContainer', textNode, innerRange.startContainer ) ; assertEquals( 'startOffset', 0, innerRange.startOffset ) ; Index: /FCKeditor/trunk/_test/automated/tests/tests.js =================================================================== --- /FCKeditor/trunk/_test/automated/tests/tests.js (revision 1563) +++ /FCKeditor/trunk/_test/automated/tests/tests.js (revision 1564) Index: /FCKeditor/trunk/_test/manual/_common/manual_test.js =================================================================== --- /FCKeditor/trunk/_test/manual/_common/manual_test.js (revision 1563) +++ /FCKeditor/trunk/_test/manual/_common/manual_test.js (revision 1564) @@ -1,3 +1,2 @@ if ( typeof FCKScriptLoader != 'undefined' ) FCKScriptLoader.FCKeditorPath = document.location.pathname.substring(0,document.location.pathname.lastIndexOf('_test')) ; - Index: /FCKeditor/trunk/_test/manual/fckdialog/test1.css =================================================================== --- /FCKeditor/trunk/_test/manual/fckdialog/test1.css (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckdialog/test1.css (revision 1564) Index: /FCKeditor/trunk/_test/manual/fckdialog/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckdialog/test1.html (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckdialog/test1.html (revision 1564) @@ -32,5 +32,5 @@ 4. Added window.focus(), fck_dialog.css, and language direction/No noticeable increase after 10 minutes. 5. Added fck_dialog_ie6.js/Steadily increasing memory usage -6. Added Init(), Throbber(), ResizeContainerSize()/No noticeable increase after 10 minutes. +6. Added Init(), Throbber(), ResizeContainerSize()/No noticeable increase after 10 minutes. 7. Added all resize logic, LoadInnerDialog() and InnerDialogLoaded(), created the Sizer and Main modules/No noticeable increase after 10 minutes. 8. Added drag and drop handlers/No noticeable increase (But I swear I saw it increasing eariler, with the same code!?!!) Index: /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1.html (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1.html (revision 1564) @@ -49,10 +49,10 @@ iterator.ForceBrBreak = document.getElementById( 'xBrBreak' ).checked ; iterator.EnforceRealBlocks = document.getElementById( 'xRealBlocks' ).checked ; - + var div = targetWindow.document.createElement( 'div' ) ; var msg = '' ; var counter = 0 ; - + var para ; while ( ( para = iterator.GetNextParagraph() ) ) // Only one = @@ -64,7 +64,7 @@ counter++ ; } - + msg = 'Number of ranges: ' + counter + msg ; - + alert( msg ) ; } Index: /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1_inner.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1_inner.html (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckdomrangeiterator/test1_inner.html (revision 1564) Index: /FCKeditor/trunk/_test/manual/fckpanel/test1/test.css =================================================================== --- /FCKeditor/trunk/_test/manual/fckpanel/test1/test.css (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckpanel/test1/test.css (revision 1564) Index: /FCKeditor/trunk/_test/manual/fckstyle/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckstyle/test1.html (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckstyle/test1.html (revision 1564) @@ -40,5 +40,5 @@ // Do not add, rename or remove styles here. -FCKConfig.CoreStyles = +FCKConfig.CoreStyles = { 'Bold' : { @@ -97,7 +97,7 @@ Attributes : { 'class' : 'Test1' }, - Overrides : { + Overrides : { Attributes : { - 'class' : /^Test\d$/ } + 'class' : /^Test\d$/ } } }, @@ -106,7 +106,7 @@ Attributes : { 'class' : 'Test2' }, - Overrides : { + Overrides : { Attributes : { - 'class' : /^Test\d$/ } + 'class' : /^Test\d$/ } } }, @@ -150,5 +150,5 @@ { var stylesCombo = document.getElementById( 'xStyles' ) ; - + for ( var styleName in styles ) { @@ -169,5 +169,5 @@ var style = new FCKStyle( styles[ document.getElementById( 'xStyles' ).value ] ) ; style.ApplyToSelection( targetWindow ) ; - + document.getElementById('xSource').value = targetWindow.document.body.innerHTML ; @@ -179,5 +179,5 @@ var style = new FCKStyle( styles[ document.getElementById( 'xStyles' ).value ] ) ; style.RemoveFromSelection( targetWindow ) ; - + document.getElementById('xSource').value = targetWindow.document.body.innerHTML ; @@ -188,5 +188,5 @@ { FCKStyles.RemoveAll() ; - + document.getElementById('xSource').value = targetWindow.document.body.innerHTML ; Index: /FCKeditor/trunk/_test/manual/fckstyle/test1_inner.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckstyle/test1_inner.html (revision 1563) +++ /FCKeditor/trunk/_test/manual/fckstyle/test1_inner.html (revision 1564) @@ -24,5 +24,5 @@ <title>Test Page Index: /FCKeditor/trunk/editor/filemanager/connectors/aspx/connector.aspx =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/aspx/connector.aspx (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/aspx/connector.aspx (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/aspx/upload.aspx =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/aspx/upload.aspx (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/aspx/upload.aspx (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/ImageObject.cfc =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/ImageObject.cfc (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/ImageObject.cfc (revision 1564) @@ -2,5 +2,5 @@ @@ -188,5 +188,5 @@ - + Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf5_upload.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_basexml.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_basexml.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_basexml.cfm (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm (revision 1564) @@ -65,4 +65,2 @@ - - Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_util.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_util.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_util.cfm (revision 1564) @@ -130,3 +130,2 @@ - Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/connector.cfm (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/image.cfc =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/image.cfc (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/image.cfc (revision 1564) @@ -1323,3 +1323,2 @@ - Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/upload.cfm (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/basexml.pl (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/commands.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/commands.pl (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/commands.pl (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/connector.cgi =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/connector.cgi (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/connector.cgi (revision 1564) @@ -135,3 +135,2 @@ exit ; } - Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/io.pl (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/upload.cgi =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/upload.cgi (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/upload.cgi (revision 1564) @@ -116,3 +116,2 @@ } - Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/upload_fck.pl (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/perl/util.pl (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/basexml.php (revision 1564) @@ -67,5 +67,5 @@ { if ( isset( $GLOBALS['HeaderSent'] ) && $GLOBALS['HeaderSent'] ) - { + { SendErrorNode( $number, $text ) ; CreateXmlFooter() ; @@ -79,7 +79,7 @@ echo '' ; - + SendErrorNode( $number, $text ) ; - + echo '' ; } Index: /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/commands.php (revision 1564) @@ -190,5 +190,5 @@ } } - + if ( isset( $Config['HtmlExtensions'] ) ) { Index: /FCKeditor/trunk/editor/filemanager/connectors/php/config.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/config.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/config.php (revision 1564) @@ -26,5 +26,5 @@ // SECURITY: You must explicitly enable this "connector". (Set it to "true"). -// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only +// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only // authenticated users can access this file or use some kind of session checking. $Config['Enabled'] = false ; @@ -65,7 +65,7 @@ Configuration settings for each Resource Type - - AllowedExtensions: the possible extensions that can be allowed. + - AllowedExtensions: the possible extensions that can be allowed. If it is empty then any file type can be uploaded. - - DeniedExtensions: The extensions that won't be allowed. + - DeniedExtensions: The extensions that won't be allowed. If it is empty then no restrictions are done here. @@ -74,11 +74,11 @@ - FileTypesPath: the virtual folder relative to the document root where - these resources will be located. + these resources will be located. Attention: It must start and end with a slash: '/' - FileTypesAbsolutePath: the physical path to the above folder. It must be - an absolute path. + an absolute path. If it's an empty string then it will be autocalculated. - Useful if you are using a virtual directory, symbolic link or alias. + Useful if you are using a virtual directory, symbolic link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. Attention: The above 'FileTypesPath' must point to the same directory. @@ -86,21 +86,21 @@ - QuickUploadPath: the virtual folder relative to the document root where - these resources will be uploaded using the Upload tab in the resources + these resources will be uploaded using the Upload tab in the resources dialogs. Attention: It must start and end with a slash: '/' - QuickUploadAbsolutePath: the physical path to the above folder. It must be - an absolute path. + an absolute path. If it's an empty string then it will be autocalculated. - Useful if you are using a virtual directory, symbolic link or alias. + Useful if you are using a virtual directory, symbolic link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. Attention: The above 'QuickUploadPath' must point to the same directory. Attention: It must end with a slash: '/' - NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to - "userfiles" directory to maintain backwards compatibility with older versions of FCKeditor. + NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to + "userfiles" directory to maintain backwards compatibility with older versions of FCKeditor. This is fine, but you in some cases you will be not able to browse uploaded files using file browser. - Example: if you click on "image button", select "Upload" tab and send image - to the server, image will appear in FCKeditor correctly, but because it is placed + Example: if you click on "image button", select "Upload" tab and send image + to the server, image will appear in FCKeditor correctly, but because it is placed directly in /userfiles/ directory, you'll be not able to see it in built-in file browser. The more expected behaviour would be to send images directly to "image" subfolder. @@ -108,8 +108,8 @@ $Config['QuickUploadPath']['Image'] = $Config['UserFilesPath'] ; $Config['QuickUploadAbsolutePath']['Image'] = $Config['UserFilesAbsolutePath'] ; - into: + into: $Config['QuickUploadPath']['Image'] = $Config['FileTypesPath']['Image'] ; - $Config['QuickUploadAbsolutePath']['Image'] = $Config['FileTypesAbsolutePath']['Image'] ; - + $Config['QuickUploadAbsolutePath']['Image'] = $Config['FileTypesAbsolutePath']['Image'] ; + */ Index: /FCKeditor/trunk/editor/filemanager/connectors/php/connector.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/connector.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/connector.php (revision 1564) @@ -50,6 +50,6 @@ $sCurrentFolder = GetCurrentFolder() ; - // Check if it is an allowed command - if ( ! IsAllowedCommand( $sCommand ) ) + // Check if it is an allowed command + if ( ! IsAllowedCommand( $sCommand ) ) SendError( 1, 'The "' . $sCommand . '" command isn\'t allowed' ) ; Index: /FCKeditor/trunk/editor/filemanager/connectors/php/io.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/io.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/io.php (revision 1564) @@ -30,5 +30,5 @@ global $Config ; - if ( $sCommand == "QuickUpload") + if ( $sCommand == "QuickUpload") return $Config['QuickUploadPath'][$resourceType] ; else @@ -39,5 +39,5 @@ { global $Config ; - if ( $sCommand == "QuickUpload") + if ( $sCommand == "QuickUpload") { if ( strlen( $Config['QuickUploadAbsolutePath'][$resourceType] ) > 0 ) @@ -104,5 +104,5 @@ return "Can't create $folderPath directory" ; } - + $sErrorMsg = CreateServerFolder( $sParent, $folderPath ) ; if ( $sErrorMsg != '' ) @@ -147,5 +147,5 @@ $sSelfPath = str_replace( '/', DIRECTORY_SEPARATOR, $sSelfPath ) ; - + $position = strpos( $sRealPath, $sSelfPath ) ; @@ -181,8 +181,8 @@ $arDenied = $Config['DeniedExtensions'][$resourceType] ; - if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) ) - return false ; - - if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) ) + if ( count($arAllowed) > 0 && !in_array( $sExtension, $arAllowed ) ) + return false ; + + if ( count($arDenied) > 0 && in_array( $sExtension, $arDenied ) ) return false ; @@ -195,5 +195,5 @@ if ( !in_array( $resourceType, $Config['ConfigAllowedTypes'] ) ) return false ; - + return true ; } @@ -205,5 +205,5 @@ if ( !in_array( $sCommand, $Config['ConfigAllowedCommands'] ) ) return false ; - + return true ; } Index: /FCKeditor/trunk/editor/filemanager/connectors/php/phpcompat.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/phpcompat.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/phpcompat.php (revision 1564) Index: /FCKeditor/trunk/editor/filemanager/connectors/php/upload.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/upload.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/upload.php (revision 1564) @@ -44,8 +44,8 @@ $sType = isset( $_GET['Type'] ) ? $_GET['Type'] : 'File' ; -$sCurrentFolder = GetCurrentFolder() ; +$sCurrentFolder = GetCurrentFolder() ; // Is enabled the upload? -if ( ! IsAllowedCommand( $sCommand ) ) +if ( ! IsAllowedCommand( $sCommand ) ) SendUploadResults( '1', '', '', 'The ""' . $sCommand . '"" command isn\'t allowed' ) ; Index: /FCKeditor/trunk/editor/filemanager/connectors/php/util.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/php/util.php (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/php/util.php (revision 1564) @@ -37,5 +37,5 @@ function ConvertToXmlAttribute( $value ) { - if ( defined( 'PHP_OS' ) ) + if ( defined( 'PHP_OS' ) ) { $os = PHP_OS ; @@ -45,13 +45,13 @@ $os = php_uname() ; } - - if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' ) + + if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' ) { return ( utf8_encode( htmlspecialchars( $value ) ) ) ; - } - else + } + else { return ( htmlspecialchars( $value ) ) ; - } + } } @@ -78,11 +78,11 @@ /** - * Detect HTML in the first KB to prevent against potential security issue with + * Detect HTML in the first KB to prevent against potential security issue with * IE/Safari/Opera file type auto detection bug. * Returns true if file contain insecure HTML code at the beginning. - * + * * @param string $filePath absolute path to file * @return boolean - */ + */ function DetectHtml( $filePath ) { @@ -93,5 +93,5 @@ $chunk = strtolower( $chunk ) ; - if (!$chunk) + if (!$chunk) { return false ; @@ -100,14 +100,14 @@ $chunk = trim( $chunk ) ; - if ( preg_match( "/""" ) - + def sendErrorNode(self, number, text): return """""" % (number, convertToXmlAttribute(text)) @@ -103,9 +103,9 @@ "This is the function that sends the results of the uploading process" return """""" % { 'errorNumber': errorNo, 'fileUrl': fileUrl.replace ('"', '\\"'), - 'fileName': fileName.replace ( '"', '\\"' ) , + 'fileName': fileName.replace ( '"', '\\"' ) , 'customMsg': customMsg.replace ( '"', '\\"' ), } Index: /FCKeditor/trunk/editor/filemanager/connectors/py/fckutil.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/fckutil.py (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/fckutil.py (revision 1564) @@ -21,5 +21,5 @@ == END LICENSE == -Utility functions for the File Manager Connector for Python +Utility functions for the File Manager Connector for Python """ @@ -50,8 +50,8 @@ def combinePaths( basePath, folder ): - return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' ) + return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' ) def getFileName(filename): - " Purpose: helper function to extrapolate the filename " + " Purpose: helper function to extrapolate the filename " for splitChar in ["/", "\\"]: array = filename.split(splitChar) @@ -76,6 +76,6 @@ def getCurrentFolder(currentFolder): - if not currentFolder: - currentFolder = '/' + if not currentFolder: + currentFolder = '/' # Check the current folder syntax (must begin and end with a slash). @@ -84,8 +84,8 @@ if (currentFolder[0] <> "/"): currentFolder = "/" + currentFolder - + # Ensure the folder path has no double-slashes while '//' in currentFolder: - currentFolder = currentFolder.replace('//','/') + currentFolder = currentFolder.replace('//','/') # Check for invalid folder paths (..) @@ -93,5 +93,5 @@ return None - return currentFolder + return currentFolder def mapServerPath( environ, url): @@ -102,5 +102,5 @@ def mapServerFolder(resourceTypePath, folderPath): - return combinePaths ( resourceTypePath , folderPath ) + return combinePaths ( resourceTypePath , folderPath ) def getRootPath(environ): @@ -112,16 +112,15 @@ return environ['DOCUMENT_ROOT'] else: - realPath = os.path.realpath( './' ) + realPath = os.path.realpath( './' ) selfPath = environ['SCRIPT_FILENAME'] - selfPath = selfPath [ : selfPath.rfind( '/' ) ] - selfPath = selfPath.replace( '/', os.path.sep) - - position = realPath.find(selfPath) + selfPath = selfPath [ : selfPath.rfind( '/' ) ] + selfPath = selfPath.replace( '/', os.path.sep) + + position = realPath.find(selfPath) # This can check only that this script isn't run from a virtual dir # But it avoids the problems that arise if it isn't checked - raise realPath + raise realPath if ( position < 0 or position <> len(realPath) - len(selfPath) or realPath[ : position ]==''): raise Exception('Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/py/config.py".') return realPath[ : position ] - Index: /FCKeditor/trunk/editor/filemanager/connectors/py/htaccess.txt =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/htaccess.txt (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/htaccess.txt (revision 1564) @@ -1,3 +1,3 @@ -# replace the name of this file to .htaccess (if using apache), +# replace the name of this file to .htaccess (if using apache), # and set the proper options and paths according your enviroment @@ -20,4 +20,4 @@ # Plain old CGI -#Options +ExecCGI +#Options +ExecCGI #AddHandler cgi-script py Index: /FCKeditor/trunk/editor/filemanager/connectors/py/upload.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/upload.py (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/upload.py (revision 1564) @@ -32,6 +32,6 @@ class FCKeditorQuickUpload( FCKeditorConnectorBase, - UploadFileCommandMixin, - BaseHttpMixin, BaseHtmlMixin): + UploadFileCommandMixin, + BaseHttpMixin, BaseHtmlMixin): def doResponse(self): "Main function. Process the request, set headers and return a string as response." @@ -49,22 +49,22 @@ # Check if it is an allowed command if ( not command in Config.ConfigAllowedCommands ): - return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command ) - + return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command ) + if ( not resourceType in Config.ConfigAllowedTypes ): - return self.sendUploadResults( 1, '', '', 'Invalid type specified' ) + return self.sendUploadResults( 1, '', '', 'Invalid type specified' ) # Setup paths - self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] - self.webUserFilesFolder = Config.QuickUploadPath[resourceType] + self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] + self.webUserFilesFolder = Config.QuickUploadPath[resourceType] if not self.userFilesFolder: # no absolute path given (dangerous...) - self.userFilesFolder = mapServerPath(self.environ, + self.userFilesFolder = mapServerPath(self.environ, self.webUserFilesFolder) - + # Ensure that the directory exists. if not os.path.exists(self.userFilesFolder): try: - self.createServerFoldercreateServerFolder( self.userFilesFolder ) + self.createServerFoldercreateServerFolder( self.userFilesFolder ) except: - return self.sendError(1, "This connector couldn\'t access to local user\'s files directories. Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ") + return self.sendError(1, "This connector couldn\'t access to local user\'s files directories. Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ") # File upload doesn't have to return XML, so intercept here @@ -80,5 +80,5 @@ if not header is None: print '%s: %s' % header - print + print print data except: Index: /FCKeditor/trunk/editor/filemanager/connectors/py/wsgi.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/wsgi.py (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/wsgi.py (revision 1564) @@ -34,5 +34,5 @@ # Running from WSGI capable server (recomended) -def App(environ, start_response): +def App(environ, start_response): "WSGI entry point. Run the connector" if environ['SCRIPT_NAME'].endswith("connector.py"): @@ -55,4 +55,4 @@ start_response("500 Internal Server Error",[("Content-type","text/html")]) file = StringIO() - cgitb.Hook(file = file).handle() + cgitb.Hook(file = file).handle() yield file.getvalue() Index: /FCKeditor/trunk/editor/filemanager/connectors/py/zope.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/connectors/py/zope.py (revision 1563) +++ /FCKeditor/trunk/editor/filemanager/connectors/py/zope.py (revision 1564) @@ -24,6 +24,6 @@ This code was not tested at all. -It just was ported from pre 2.5 release, so for further reference see -\editor\filemanager\browser\default\connectors\py\connector.py in previous +It just was ported from pre 2.5 release, so for further reference see +\editor\filemanager\browser\default\connectors\py\connector.py in previous releases. @@ -49,5 +49,5 @@ self.context = context self.request = FCKeditorRequest(context) - + def getZopeRootContext(self): if self.zopeRootContext is None: @@ -187,3 +187,2 @@ return connector.FCKeditorConnectorZope(context=context).doResponse() """ - Index: /FCKeditor/trunk/editor/lang/et.js =================================================================== --- /FCKeditor/trunk/editor/lang/et.js (revision 1563) +++ /FCKeditor/trunk/editor/lang/et.js (revision 1564) Index: /FCKeditor/trunk/editor/plugins/bbcode/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/bbcode/fckplugin.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/bbcode/fckplugin.js (revision 1564) Index: /FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js (revision 1564) @@ -101,5 +101,5 @@ // Calculate maximum and minimum x-coordinate delta. var borderIndex = FCKDragTableHandler._GetResizeBarPosition() ; - var offset = FCKDragTableHandler._GetIframeOffset(); + var offset = FCKDragTableHandler._GetIframeOffset(); var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" ); var minX = null ; Index: /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html (revision 1563) +++ /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html (revision 1564) Index: /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js (revision 1564) Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js (revision 1564) Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js (revision 1564) Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js (revision 1563) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js (revision 1564) Index: /FCKeditor/trunk/editor/skins/default/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/default/fck_dialog.css (revision 1563) +++ /FCKeditor/trunk/editor/skins/default/fck_dialog.css (revision 1564) @@ -357,7 +357,7 @@ } -#throbberBlock -{ - z-index: 10; +#throbberBlock +{ + z-index: 10; } @@ -372,5 +372,5 @@ } -/* +/* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=737357&cend=E3E3C7&steps=4 Index: /FCKeditor/trunk/editor/skins/default/fck_dialog_ie6.js =================================================================== --- /FCKeditor/trunk/editor/skins/default/fck_dialog_ie6.js (revision 1563) +++ /FCKeditor/trunk/editor/skins/default/fck_dialog_ie6.js (revision 1564) @@ -28,5 +28,5 @@ { var fckDlg = window.document.body ; - + for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ ) { @@ -44,5 +44,5 @@ child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 break ; - + case 'tr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; @@ -52,23 +52,23 @@ child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; break ; - + case 'ml' : child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'mr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'bl' : child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'br' : child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'bc' : child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; @@ -78,15 +78,15 @@ } } - + var closeButtonOver = function() { this.style.backgroundPosition = '-16px -687px' ; } ; - + var closeButtonOut = function() { this.style.backgroundPosition = '-16px -651px' ; } ; - + var fixCloseButton = function() { @@ -96,14 +96,14 @@ closeButton.onmouseout = closeButtonOut ; } - + var onLoad = function() { fixSizes() ; fixCloseButton() ; - + window.attachEvent( 'onresize', fixSizes ) ; window.detachEvent( 'onload', onLoad ) ; } - + window.attachEvent( 'onload', onLoad ) ; Index: /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css (revision 1563) +++ /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css (revision 1564) @@ -152,5 +152,5 @@ } -#tdBrowse +#tdBrowse { vertical-align: bottom; @@ -357,7 +357,7 @@ } -#throbberBlock -{ - z-index: 10; +#throbberBlock +{ + z-index: 10; } @@ -372,5 +372,5 @@ } -/* +/* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=0E3460&cend=8cb2fd&steps=4 Index: /FCKeditor/trunk/editor/skins/office2003/fck_dialog_ie6.js =================================================================== --- /FCKeditor/trunk/editor/skins/office2003/fck_dialog_ie6.js (revision 1563) +++ /FCKeditor/trunk/editor/skins/office2003/fck_dialog_ie6.js (revision 1564) @@ -28,5 +28,5 @@ { var fckDlg = window.document.body ; - + for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ ) { @@ -44,5 +44,5 @@ child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 break ; - + case 'tr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; @@ -52,23 +52,23 @@ child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; break ; - + case 'ml' : child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'mr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'bl' : child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'br' : child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'bc' : child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; @@ -78,15 +78,15 @@ } } - + var closeButtonOver = function() { this.style.backgroundPosition = '-16px -687px' ; } ; - + var closeButtonOut = function() { this.style.backgroundPosition = '-16px -651px' ; } ; - + var fixCloseButton = function() { @@ -96,14 +96,14 @@ closeButton.onmouseout = closeButtonOut ; } - + var onLoad = function() { fixSizes() ; fixCloseButton() ; - + window.attachEvent( 'onresize', fixSizes ) ; window.detachEvent( 'onload', onLoad ) ; } - + window.attachEvent( 'onload', onLoad ) ; Index: /FCKeditor/trunk/editor/skins/silver/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/silver/fck_dialog.css (revision 1563) +++ /FCKeditor/trunk/editor/skins/silver/fck_dialog.css (revision 1564) @@ -152,5 +152,5 @@ } -#tdBrowse +#tdBrowse { vertical-align: bottom; @@ -357,7 +357,7 @@ } -#throbberBlock -{ - z-index: 10; +#throbberBlock +{ + z-index: 10; } @@ -372,5 +372,5 @@ } -/* +/* Color Gradient Generator: http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4 Index: /FCKeditor/trunk/editor/skins/silver/fck_dialog_ie6.js =================================================================== --- /FCKeditor/trunk/editor/skins/silver/fck_dialog_ie6.js (revision 1563) +++ /FCKeditor/trunk/editor/skins/silver/fck_dialog_ie6.js (revision 1564) @@ -28,5 +28,5 @@ { var fckDlg = window.document.body ; - + for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ ) { @@ -44,5 +44,5 @@ child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ; // -bottom -top + 4 break ; - + case 'tr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; @@ -52,23 +52,23 @@ child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ; break ; - + case 'ml' : child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'mr' : child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ; child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ; break ; - + case 'bl' : child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'br' : child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ; child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ; break ; - + case 'bc' : child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ; @@ -78,15 +78,15 @@ } } - + var closeButtonOver = function() { this.style.backgroundPosition = '-16px -687px' ; } ; - + var closeButtonOut = function() { this.style.backgroundPosition = '-16px -651px' ; } ; - + var fixCloseButton = function() { @@ -96,14 +96,14 @@ closeButton.onmouseout = closeButtonOut ; } - + var onLoad = function() { fixSizes() ; fixCloseButton() ; - + window.attachEvent( 'onresize', fixSizes ) ; window.detachEvent( 'onload', onLoad ) ; } - + window.attachEvent( 'onload', onLoad ) ; Index: /FCKeditor/trunk/fckconfig.js =================================================================== --- /FCKeditor/trunk/fckconfig.js (revision 1563) +++ /FCKeditor/trunk/fckconfig.js (revision 1564) @@ -190,5 +190,5 @@ FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var' ; -FCKConfig.CustomStyles = +FCKConfig.CustomStyles = { 'Red Title' : { Element : 'h3', Styles : { 'color' : 'Red' } } @@ -196,5 +196,5 @@ // Do not add, rename or remove styles here. Only apply definition changes. -FCKConfig.CoreStyles = +FCKConfig.CoreStyles = { // Basic Inline Styles. @@ -205,5 +205,5 @@ 'Subscript' : { Element : 'sub' }, 'Superscript' : { Element : 'sup' }, - + // Basic Block Styles (Font Format Combo). 'p' : { Element : 'p' }, @@ -217,27 +217,27 @@ 'h5' : { Element : 'h5' }, 'h6' : { Element : 'h6' }, - + // Other formatting features. - 'FontFace' : - { - Element : 'span', - Styles : { 'font-family' : '#("Font")' }, + 'FontFace' : + { + Element : 'span', + Styles : { 'font-family' : '#("Font")' }, Overrides : [ { Element : 'font', Attributes : { 'face' : null } } ] }, - + 'Size' : - { - Element : 'span', - Styles : { 'font-size' : '#("Size","fontSize")' }, + { + Element : 'span', + Styles : { 'font-size' : '#("Size","fontSize")' }, Overrides : [ { Element : 'font', Attributes : { 'size' : null } } ] }, - + 'Color' : - { - Element : 'span', - Styles : { 'color' : '#("Color","color")' }, + { + Element : 'span', + Styles : { 'color' : '#("Color","color")' }, Overrides : [ { Element : 'font', Attributes : { 'color' : null } } ] }, - + 'BackColor' : { Element : 'span', Styles : { 'background-color' : '#("Color","color")' } }, Index: /FCKeditor/trunk/fckeditor.afp =================================================================== --- /FCKeditor/trunk/fckeditor.afp (revision 1563) +++ /FCKeditor/trunk/fckeditor.afp (revision 1564) Index: /FCKeditor/trunk/fckeditor.asp =================================================================== --- /FCKeditor/trunk/fckeditor.asp (revision 1563) +++ /FCKeditor/trunk/fckeditor.asp (revision 1564) @@ -132,5 +132,5 @@ End If - CreateHtml = html + CreateHtml = html End Function @@ -169,15 +169,15 @@ ' The locale of the asp server makes the conversion of a boolean to string different to "true" or "false" ' so we must do it manually - If vartype(valueToEncode) = vbBoolean then + If vartype(valueToEncode) = vbBoolean then If valueToEncode=True Then EncodeConfig="True" Else EncodeConfig="False" - End If + End If Else EncodeConfig = Replace( valueToEncode, "&", "%26" ) EncodeConfig = Replace( EncodeConfig , "=", "%3D" ) EncodeConfig = Replace( EncodeConfig , """", "%22" ) - End if + End if End Function Index: /FCKeditor/trunk/fckeditor.js =================================================================== --- /FCKeditor/trunk/fckeditor.js (revision 1563) +++ /FCKeditor/trunk/fckeditor.js (revision 1564) @@ -204,11 +204,11 @@ { var editor = new FCKeditor( textarea.name ) ; - + editor.Width = Math.max( textarea.offsetWidth, FCKeditor.MinWidth ) ; editor.Height = Math.max( textarea.offsetHeight, FCKeditor.MinHeight ) ; - + return editor ; } - + /** * Replace all