Index: /CKEditor/branches/versions/3.3.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5804) +++ /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5805) @@ -35,4 +35,83 @@ CKEditor Changelog +

+ CKEditor 3.3.2

+

+ New features:

+ +

+ Fixed issues:

+

CKEditor 3.3.1

Index: /CKEditor/branches/versions/3.3.x/_dev/docs_build/docs_build.conf =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/docs_build/docs_build.conf (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/docs_build/docs_build.conf (revision 5805) @@ -1,3 +1,3 @@ -/* +/* This is an example of one way you could set up a configuration file to more conveniently define some commandline options. You might like to do this if Index: /CKEditor/branches/versions/3.3.x/_dev/dtd_test/dtd_test.html =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/dtd_test/dtd_test.html (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/dtd_test/dtd_test.html (revision 5805) @@ -11,5 +11,5 @@ // Define the CKEDITOR namespace. -var CKEDITOR = {}; +var CKEDITOR = { on : function(){} }; //]]> Index: /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.bat =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.bat (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.bat (revision 5805) @@ -5,3 +5,3 @@ :: -php fixlineends.php --excluderegex=/(?:_dev[\\\/]_thirdparty)/ --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem ../../ +php fixlineends.php --excluderegex=/(?:_dev[\\\/]_thirdparty)/ --eolstripwhite --eofnewline --eofstripwhite --nohidden --nosystem --fixbom ../../ Index: /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.php =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.php (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/fixlineends/fixlineends.php (revision 5805) @@ -64,4 +64,8 @@ $list["xml"] = CRLF; +$bom = array(); +$bom['asp'] = true; +$bom['js'] = true; + /** * Do not modify anything below @@ -107,4 +111,9 @@ */ $nodotfiles = false; +/** + * If set to true, BOM characters are fixed + * @var boolean $fixbom + */ +$fixbom = false; /** * How deep to recurse into subdirectories @@ -317,4 +326,15 @@ } $new_content .= $line; + } + + if ($GLOBALS['fixbom']) { + $before_fixing = $new_content; + $ext = strtolower(substr($path, strrpos($path, ".") + 1)); + $new_content = stripUtf8Bom( $new_content ); + if (!empty($GLOBALS['bom'][$ext])) { + $new_content = "\xEF\xBB\xBF" . $new_content; // BOM + } + if ($new_content != $before_fixing) + $modified = true; } @@ -353,4 +373,16 @@ /** + * Strip BOM from a string + * @param string $data + */ +function stripUtf8Bom( $data ) +{ + if ( substr( $data, 0, 3 ) == "\xEF\xBB\xBF" ) + return stripUtf8Bom(substr_replace( $data, '', 0, 3 )) ; + + return $data ; +} + +/** * Fix ending lines in all files at given path * @@ -453,18 +485,21 @@ use regex to exclude files, preg_match() format expected + --fixbom + fix BOM characters + --help display this help and exit --noarchive - if set to true, archive files are skipped (Windows only) + skip archive files (Windows only) --nodotfiles - if set to true, dot files are skipped + skip dot files --nohidden - if set to true, hidden files are skipped (Windows only) + skip hidden files (Windows only) --nosystem - if set to true, system files are skipped (Windows only) + skip system files (Windows only) --maxdepth @@ -525,4 +560,8 @@ case '--nodotfiles': $GLOBALS['nodotfiles'] = true; + break; + + case '--fixbom': + $GLOBALS['fixbom'] = true; break; @@ -572,11 +611,11 @@ if ($_SERVER['argc']>1) { - include "../_thirdparty/console_getopt/Getopt.php"; + include "../_thirdparty/console_getopt/Getopt.php"; if ($windows) { - $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "noarchive", "nohidden", "nosystem", "nodotfiles", "maxdepth=", "excluderegex="); + $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "noarchive", "nohidden", "nosystem", "nodotfiles", "maxdepth=", "excluderegex=", "fixbom"); } else { - $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "nodotfiles", "maxdepth=", "excluderegex="); + $longoptions = array("eofstripwhite", "eofnewline", "eolstripwhite", "help", "nodotfiles", "maxdepth=", "excluderegex=", "fixbom"); } Index: /CKEditor/branches/versions/3.3.x/_dev/packager/packagefilegen_full.html =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/packager/packagefilegen_full.html (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/packager/packagefilegen_full.html (revision 5805) @@ -80,5 +80,5 @@ var path = downloaded[i].replace( CKEDITOR.basePath, '' ); - if ( path == 'config.js' ) + if ( path == 'config.js' || /\/styles\/default\.js/.test( path ) ) continue; Index: /CKEditor/branches/versions/3.3.x/_dev/releaser/release.bat =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/releaser/release.bat (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/releaser/release.bat (revision 5805) @@ -11,3 +11,3 @@ :: rmdir /S /Q release -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.1" ckeditor_3.3.1 --run-before-release=langtool.bat +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.2" ckeditor_3.3.2 --run-before-release=langtool.bat Index: /CKEditor/branches/versions/3.3.x/_dev/releaser/release.sh =================================================================== --- /CKEditor/branches/versions/3.3.x/_dev/releaser/release.sh (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_dev/releaser/release.sh (revision 5805) @@ -13,4 +13,4 @@ pushd $DIR -java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.1" ckeditor_3.3.1 --run-before-release=$LANGTOOL +java -jar ckreleaser/ckreleaser.jar ckreleaser.release ../.. release "3.3.2" ckeditor_3.3.2 --run-before-release=$LANGTOOL popd Index: /CKEditor/branches/versions/3.3.x/_samples/api_dialog.html =================================================================== --- /CKEditor/branches/versions/3.3.x/_samples/api_dialog.html (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_samples/api_dialog.html (revision 5805) @@ -92,4 +92,11 @@ ] }); + + // Rewrite the 'onFocus' handler to always focus 'url' field. + dialogDefinition.onFocus = function() + { + var urlField = this.getContentElement( 'info', 'url' ); + urlField.select(); + }; } }); Index: /CKEditor/branches/versions/3.3.x/_samples/jqueryadapter.html =================================================================== --- /CKEditor/branches/versions/3.3.x/_samples/jqueryadapter.html (revision 5804) +++ /CKEditor/branches/versions/3.3.x/_samples/jqueryadapter.html (revision 5805) @@ -8,5 +8,5 @@ jQuery adapter - CKEditor Sample - +