Index: /CKEditor/branches/versions/3.4.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5714)
+++ /CKEditor/branches/versions/3.4.x/CHANGES.html (revision 5715)
@@ -35,4 +35,5 @@
CKEditor Changelog
+
CKEditor 3.4 (SVN)
@@ -49,4 +50,11 @@
Fixed issues:
+ - #5415 : Undo not working when we change the Table Properties for the table on a saved page.
+ - #5435 : IE: we can't start Numbered/Bulleted list in Tables by Clicking on Insert/Remove Numbers/Bullets Icon.
+ - #5832 : Jquery adapter sample and SSL.
+ - #5728 : Text field & Upload Button in Upload Tab of Image Properties dialog are not shown Properly in Arabic.
+ - #5079 : Page break in lists move to above the list when you switch from WYSIWYG to HTML mode and back.
+ - #5436 : IE: Cursor goes to next Table Cell after we insert a Smiley in the Table Cell.
+ - #5580 : Maximize does not work properly in the Office 2003 and V2 skins.
- #5911 : BIDI: List items should support and retain correct base language direction
- #5415 : Undo not working when we change the Table Properties for the table on a saved page.
@@ -57,5 +65,6 @@
New features:
-
+ - #5882 : New event dialog#selectPage like the OnDialogTabChange in FCKeditor.
+ - #5927 : The native controls in ui.dialog elements can be styled with a controlStyle definition.
@@ -70,4 +79,24 @@
- #5860 : [IE] > in attribute values are incorrectly escaped.
- #5905 : SCAYT is not any more enabled by default.
+ - #5736 : Improved the text generated for mailto: links if no text was selected.
+ - #4779 : Adjust resize_minWidth and Height if smaller than actual dimensions.
+ - #5687 : Navigation through colors is now compatible with RTL.
+ - #4615 : [IE] Text fields are no longer disrupted in dialog with RTL.
+ - #5887 : The number of columns in the smilies table is now configurable via the smiley_columns setting.
+ - #5100 : It was possible to drag&drop some elements like context menu items or dropdown entries.
+ - #5933 : Text color and background color panels don't have scrollbars anymore under office2003 and v2 skins.
+ - #5943 : An error is no longer generated when using percent or pixel values in the image dialog.
+ - #5951 : Avoid problems with security systems due to the usage of UniversalXPConnect.
+ - #5441 : Avoid errors if the editor instance is removed from the DOM before calling its destroy() method.
+ - #4997 : Provide better access to the native input in the ui.dialog.file element.
+ - #5914 : Modified the Smilies dialog to make active only the images and not their borders.
+ - #5565 : The scrollbar does not behaves erratically when opening a rich combo in RTL page.
+ - #5843 : In CKEditor 3.3: When we set the focus in the 'instanceReady' event, FF3.6 is giving js error.
+ - #5902 : paste and pastetext dialogs can not be skinned easily.
+ - #5959 : Dialog auto focus does not check for hidden tabs.
+ - Updated the following language files:
+ - Hebrew;
+ - #5962 : German;
+
Index: /CKEditor/branches/versions/3.4.x/_dev/docs_build/docs_build.conf
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/docs_build/docs_build.conf (revision 5714)
+++ /CKEditor/branches/versions/3.4.x/_dev/docs_build/docs_build.conf (revision 5715)
@@ -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.4.x/_dev/fixlineends/fixlineends.bat
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/fixlineends/fixlineends.bat (revision 5714)
+++ /CKEditor/branches/versions/3.4.x/_dev/fixlineends/fixlineends.bat (revision 5715)
@@ -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.4.x/_dev/fixlineends/fixlineends.php
===================================================================
--- /CKEditor/branches/versions/3.4.x/_dev/fixlineends/fixlineends.php (revision 5714)
+++ /CKEditor/branches/versions/3.4.x/_dev/fixlineends/fixlineends.php (revision 5715)
@@ -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.4.x/_samples/jqueryadapter.html
===================================================================
--- /CKEditor/branches/versions/3.4.x/_samples/jqueryadapter.html (revision 5714)
+++ /CKEditor/branches/versions/3.4.x/_samples/jqueryadapter.html (revision 5715)
@@ -8,5 +8,5 @@
jQuery adapter - CKEditor Sample
-
+