Index: /CKEditor/branches/versions/3.2.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5183)
+++ /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5184)
@@ -48,4 +48,18 @@
#4399 : Improved support for external file browsers by allowing to execute a callback function.
#4612 : Update text view when user changes protocol.
+
+
+
+ Fixed issues:
+
+
+ CKEditor 3.1.1 (SVN)
+
+ New features:
+
+ - #4399 : Improved support for external file browsers by allowing executing a callback function.
+ - #4612 : The text of links is now updated if it matches the URL to which it points to.
- #4936 : New localization support for the Welsh language.
- #4973 : The style combo in Div dialog is now utilizing the default styleset defined by Styles Combo.
@@ -54,41 +68,41 @@
Fixed issues:
- - #4272 : Kama skin toolbar was broken in IE+RTL+quirks.
- - #4987 : Changed the url which is called by the Browser Server button in Link tab of Image Properties dialog.
- - #5030 : Fixed CKEDITOR.timestamp wasn't added while loading skin.js.
- - #4993 : Remove float value of image in case user selects 'not set'.
- - #4944 : Fixed a bug where nested list structure with inconsequent levels are not pasted correclty from MS-Word.
- - #4637 : Table cells' 'nowrap' attribute is not loaded to cell property dialog. Thanks to pomu0325.
+ - #4272 : Kama skin toolbar was broken in IE+Quirks+RTL.
+ - #4987 : Changed the url which is called by the Browser Server button in the Link tab of Image Properties dialog.
+ - #5030 : The CKEDITOR.timestamp wasn't been appended to the skin.js file.
+ - #4993 : Removed the float style from images when the user selects 'not set' for alignment.
+ - #4944 : Fixed a bug where nested list structures with inconsequent levels were not being pasted correctly from MS Word.
+ - #4637 : Table cells' 'nowrap' attribute was not being loaded by the cell property dialog. Thanks to pomu0325.
- #4724 : Using the mouse to insert a link in IE might create incorrect results.
- #4640 : Small optimizations for the fileBrowser plugin.
- - #4583 : The "Target Frame Name" field only visible when select is 'frame'.
- - #4863 : Fixing iframedialog's height doesn't stretch to 100%
+ - #4583 : The "Target Frame Name" field is now visible when target is set to 'frame' only.
+ - #4863 : Fixing iframedialog's height doesn't stretch to 100%.
- #4964 : The BACKSPACE key positioning was not correct in some cases with Firefox.
- - #4980 : The border, vspace, hspace of img are zero not working.
- - #4773 : The fileBrowser plugin overwrote any onClick function for a fileButton element.
+ - #4980 : Setting border, vspace and hspace of images to zero was not working.
+ - #4773 : The fileBrowser plugin was overwriting onClick functions eventually defined on fileButton elements.
- #4731 : The clipboard plugin was missing a reference to the dialog plugin.
- #5051 : The about plugin was missing a reference to the dialog plugin.
- #5146 : The wsc plugin was missing a reference to the dialog plugin.
- #4632 : The print command will now properly break on the insertion point of page break for printing.
- - #4862 : Corrected English (United Kingdom) locale as en-gb.
+ - #4862 : The English (United Kingdom) language file has been renamed to en-gb.js.
- #4618 : Selecting an emoticon or the lock and reset buttons in the image dialog fired the onBeforeUnload event in IE.
- - #4678 : Respect empty width in tables.
+ - #4678 : It was not possible to set tables' width to empty value.
- #5012 : Fixed dependency issues with the menu plugin.
- #5040 : The editor will not properly ignore font related settings that have extra item separators (semi-colons).
- #4046 : Justify should respect config.enterMode = CKEDITOR.ENTER_BR.
- - #4622 : Inserting table multiple times will corrupt the undo system.
+ - #4622 : Inserting tables multiple times was corrupting the undo system.
- #4647 : [IE] Selection on an element within positioned container is lost after open context-menu then click one menu item.
- - #4683 : Double-quote character in attribute values is not escaped in editor output.
+ - #4683 : Double-quote character in attribute values was not escaped in the editor output.
- #4762 : [IE] Unexpected vertical-scrolling behavior happens whenever focus is moving out of editor in source mode.
- - #4772 : Fore-color style must be applied within a link instead of wrapping it.
+ - #4772 : Text color was not being applied properly on links.
- #4795 : [IE] Press 'Del' key on horizontal line or table result in error.
- - #4824 : [IE] <br/> at the very first table cell breaks the editor selection.
+ - #4824 : [IE] <br/> at the very first table cell breaks the editor selection.
- #4851 : [IE] Delete table rows with context-menu may cause error.
- - #4951 : Replacing patterns into empty string throws errors.
- - #4963 : Link dialog doesn't open properly for e-mail type links.
+ - #4951 : Replacing text with empty string was throwing errors.
+ - #4963 : Link dialog was not opening properly for e-mail type links.
- #5043 : Removed the possibility of having an unwanted script tag being outputted with the editor contents.
- #3678 : There were issues when editing links inside floating divs with IE.
- - #4763 : Press Enter key with text selected will not delete the text.
- - #5096 : Simple ampersand attribute value doesn't work for more than once occurance.
+ - #4763 : Pressing ENTER key with text selected was not deleting the text in some situations.
+ - #5096 : Simple ampersand attribute value doesn't work for more than one occurrence.
- #3494 : Context menu is too narrow in some translations.
- #5049 : Form Field list command in JAWS incorrectly lists extra fields.
@@ -97,15 +111,15 @@
- #5005 : Fixed HTML errors in PHP samples.
- #5123 : Fixed broken XHTML in User Interface Languages sample.
- - #4893 : Editor should understand table cell inline styles.
- - #4611 : Selection around <select> in editor doesn't anymore cause error.
+ - #4893 : Editor now understands table cell inline styles.
+ - #4611 : Selection around <select> in editor doesn't cause error anymore.
- #4886 : Extra BR tags were being created in the output HTML.
- #4933 : Empty tags with BR were being left in the DOM.
- - #5127 : Remove dialog definition pages sometimes been error prone.
- - #4767 : CKEditor does not work when ckeditor_source.js is loaded in the <body> .
- - #5062 : Security warning message occurs when loading wysiwyg area in IE6 under HTTPS.
+ - #5127 : There were errors when removing dialog definition pages through code.
+ - #4767 : CKEditor was not working when ckeditor_source.js is loaded in the <body> .
+ - #5062 : Avoided security warning message when loading the wysiwyg area in IE6 under HTTPS.
- #5135 : The TAB key will now behave properly when in Source mode.
- #4988 : It wasn't possible to use forcePasteAsPlainText with Safari on Mac.
- - #5095 : Safari on Mac deleted current selection when Edit menu was clicked.
- - #5140 : In High Contrast mode, arrows will now be displayed for menus with submenus.
+ - #5095 : Safari on Mac deleted the current selection in the editor when Edit menu was clicked.
+ - #5140 : In High Contrast mode, arrows were now been displayed for menus with submenus.
- #5163 : The undo system was not working on some specific cases.
- #5162 : The ajax sample was throwing errors when loading data.
Index: /CKEditor/branches/versions/3.2.x/_source/core/dataprocessor.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/dataprocessor.js (revision 5184)
+++ /CKEditor/branches/versions/3.2.x/_source/core/dataprocessor.js (revision 5184)
@@ -0,0 +1,66 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+/**
+ * @fileOverview Defines the "virtual" {@link CKEDITOR.dataProcessor} class, which
+ * defines the basic structure of data processor objects to be
+ * set to {@link CKEDITOR.editor.dataProcessor}.
+ */
+
+/**
+ * If defined, points to the data processor which is responsible to translate
+ * and transform the editor data on input and output.
+ * Generaly it will point to an instance of {@link CKEDITOR.htmlDataProcessor},
+ * which handles HTML data. The editor may also handle other data formats by
+ * using different data processors provided by specific plugins.
+ * @name CKEDITOR.editor.dataProcessor
+ * @type CKEDITOR.dataProcessor
+ */
+
+/**
+ * Represents a data processor, which is responsible to translate and transform
+ * the editor data on input and output.
+ * This class is not really part of the API. It's here for documentation
+ * purposes, and serves as the base ("interface") for data processors
+ * implementation.
+ * @name CKEDITOR.dataProcessor
+ * @contructor
+ * @example
+ */
+
+/**
+ * Transforms input data into HTML to be loaded in the editor.
+ * While the editor is able to handle non HTML data (like BBCode), at runtime
+ * it can handle HTML data only. The role of the data processor is transforming
+ * the input data into HTML through this function.
+ * @name CKEDITOR.dataProcessor.prototype.toHtml
+ * @function
+ * @param {String} data The input data to be transformed.
+ * @param {String} [fixForBody] The tag name to be used if the data must be
+ * fixed because it is supposed to be loaded direcly into the <body>
+ * tag. This is generally not used by non-HTML data processors.
+ * @example
+ * // Tranforming BBCode data, having a custom BBCode data processor.
+ * var data = 'This is [b]an example[/b].';
+ * var html = editor.dataProcessor.toHtml( data ); // '<p>This is <b>an example</b>.</p>'
+ */
+
+/**
+ * Transforms HTML into data to be outputted by the editor, in the format
+ * expected by the data processor.
+ * While the editor is able to handle non HTML data (like BBCode), at runtime
+ * it can handle HTML data only. The role of the data processor is transforming
+ * the HTML data containined by the editor into a specific data format through
+ * this function.
+ * @name CKEDITOR.dataProcessor.prototype.toDataFormat
+ * @function
+ * @param {String} html The HTML to be transformed.
+ * @param {String} fixForBody The tag name to be used if the output data is
+ * coming from <body> and may be eventually fixed for it. This is
+ * generally not used by non-HTML data processors.
+ * // Tranforming into BBCode data, having a custom BBCode data processor.
+ * var html = '<p>This is <b>an example</b>.</p>';
+ * var data = editor.dataProcessor.toDataFormat( html ); // 'This is [b]an example[/b].'
+ */
Index: /CKEditor/branches/versions/3.2.x/_source/plugins/tabletools/dialogs/tableCell.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/plugins/tabletools/dialogs/tableCell.js (revision 5183)
+++ /CKEditor/branches/versions/3.2.x/_source/plugins/tabletools/dialogs/tableCell.js (revision 5184)
@@ -264,5 +264,5 @@
textAlignStyle = element.getStyle( 'text-align');
- this.setValue( textAlignStyle || alignAttr );
+ this.setValue( textAlignStyle || alignAttr || '' );
},
commit : function( selectedCell )
@@ -310,5 +310,5 @@
}
- this.setValue( vAlignStyle || vAlignAttr );
+ this.setValue( vAlignStyle || vAlignAttr || '' );
},
commit : function( element )
Index: /CKEditor/branches/versions/3.2.x/ckeditor.pack
===================================================================
--- /CKEditor/branches/versions/3.2.x/ckeditor.pack (revision 5183)
+++ /CKEditor/branches/versions/3.2.x/ckeditor.pack (revision 5184)
@@ -21,4 +21,5 @@
'CKEDITOR.ALT' : 4000,
'CKEDITOR.NODE_ELEMENT' : 1,
+ 'CKEDITOR.NODE_DOCUMENT' : 9,
'CKEDITOR.NODE_TEXT' : 3,
'CKEDITOR.NODE_COMMENT' : 8,
@@ -47,4 +48,10 @@
'CKEDITOR.STARTEND' : 3,
'CKEDITOR.UI_BUTTON' : 1,
+ 'CKEDITOR.DIALOG_RESIZE_NONE' : 0,
+ 'CKEDITOR.DIALOG_RESIZE_WIDTH' : 1,
+ 'CKEDITOR.DIALOG_RESIZE_HEIGHT' : 2,
+ 'CKEDITOR.DIALOG_RESIZE_BOTH' : 3,
+ 'CKEDITOR.VALIDATE_OR' : 1,
+ 'CKEDITOR.VALIDATE_AND' : 2,
'CKEDITOR.STYLE_BLOCK' : 1,
'CKEDITOR.STYLE_INLINE' : 2,
@@ -56,10 +63,4 @@
'CKEDITOR.UI_RICHCOMBO' : 3,
'CKEDITOR.UI_MENUBUTTON' : 5,
- 'CKEDITOR.DIALOG_RESIZE_NONE' : 0,
- 'CKEDITOR.DIALOG_RESIZE_WIDTH' : 1,
- 'CKEDITOR.DIALOG_RESIZE_HEIGHT' : 2,
- 'CKEDITOR.DIALOG_RESIZE_BOTH' : 3,
- 'CKEDITOR.VALIDATE_OR' : 1,
- 'CKEDITOR.VALIDATE_AND' : 2,
'CKEDITOR.UI_PANEL' : 2
},
@@ -131,4 +132,5 @@
// '_source/lang/en.js',
'_source/plugins/about/plugin.js',
+ '_source/plugins/a11yhelp/plugin.js',
'_source/plugins/basicstyles/plugin.js',
'_source/plugins/blockquote/plugin.js',
@@ -182,4 +184,5 @@
'_source/plugins/wysiwygarea/plugin.js',
'_source/plugins/wsc/plugin.js',
+ '_source/plugins/dialog/plugin.js',
'_source/plugins/styles/plugin.js',
'_source/plugins/domiterator/plugin.js',
@@ -193,8 +196,7 @@
'_source/plugins/htmlwriter/plugin.js',
'_source/plugins/menubutton/plugin.js',
- '_source/plugins/dialog/plugin.js',
+ '_source/plugins/dialogui/plugin.js',
'_source/plugins/panel/plugin.js',
'_source/plugins/listblock/plugin.js',
- '_source/plugins/dialogui/plugin.js',
'_source/themes/default/theme.js'
]