Index: /CKEditor/branches/versions/3.5.x/CHANGES.html
===================================================================
--- /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/CHANGES.html (revision 6075)
@@ -36,8 +36,10 @@
+ CKEditor 3.4.3 (SVN)
CKEditor 3.5 (SVN)
New features:
+
- #5755 : Introduced the dialog_buttonsOrder setting, making it possible to control the buttons order.
- #4648 : Added the new Iframe plugin.
@@ -51,4 +53,10 @@
- #5587 : Visual improvements in dialogs.
- #4652 : Config for disable editor context menu.
+ - #6569 : Indentation now honors text direction of the only item.
+ - #6579 : The jQuery adapter wasn't working properly tunning on incompatible environments.
+ - #6471 : BIDI: Pressing decrease indent in an RTL bulleted list causes incorrect behaviour.
+ - #6644 : Restrict onmousedown handler to the toolbar area.
+ - #6656 : Panelbutton's buttons became active when clicking on source.
+ - #5404 : Whitespaces (NBSP) were incorrectly added into empty table cells and list items.
- Updated the following language files:
- Hebrew;
@@ -67,5 +75,5 @@
- #5237 : English text in dialogs' title was flipped when using RTL language (office2003 and v2 skins).
- #6289 : Deleting nested table removed the parent cell.
- - #6341 : The editor contents now has the text cursor.
+ - #6341 : The editor contents now have the text cursor.
- #6153 : Chrome: tab focus is wrong.
- #6261 : Focus and infinite loop between multiple editors.
@@ -82,5 +90,4 @@
- #6377 : FF width and height are not shown for smiley in Image properties dialog.
- #5399 : Lists pasted from Word do not maintain their nesting.
- - #6225 : [FF] Can not transform sevaral lines to list with enterMode BR.
- #6467 : [FF] It is now possible to disable the plugin command on "mode" event.
- #6461 : Attributes are now being kept when changing block formatting.
@@ -89,5 +96,4 @@
- #6444 : [Opera] Close panels and dialogs don't return focus to wysiwyg frame.
- #6332 : IE: V2 skin bottom dialog's border broken.
- - #5646 : Parser incorreclty removes inline element when there's only one comment node enclosed.
- #6189 : Minor code size reduction.
- #5045 : uiColor behaved wrong if multiple editors were used with period in their names.
Index: /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/adapters/jquery.js (revision 6075)
@@ -98,4 +98,7 @@
ckeditor: function( callback, config )
{
+ if ( !CKEDITOR.env.isCompatible )
+ return this;
+
if ( !jQuery.isFunction( callback ))
{
Index: /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/core/dom/range.js (revision 6075)
@@ -1406,5 +1406,5 @@
if( startNode.type == CKEDITOR.NODE_ELEMENT
&& CKEDITOR.dtd.$empty[ startNode.getName() ] )
- startNode = startNode.getParent(), startOffset = startNode.getIndex();
+ startOffset = startNode.getIndex(), startNode = startNode.getParent();
this.startContainer = startNode;
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/htmldataprocessor/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/htmldataprocessor/plugin.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/htmldataprocessor/plugin.js (revision 6075)
@@ -39,6 +39,15 @@
}
- function blockNeedsExtension( block )
- {
+ function blockNeedsExtension( block, fromSource )
+ {
+ // 1. For IE version >=8, empty blocks are displayed correctly themself in wysiwiyg;
+ // 2. For the rest, at least table cell and list item need no filler space.
+ // (#6248)
+ if ( fromSource && CKEDITOR.env.ie &&
+ ( document.documentMode > 7
+ || block.name in CKEDITOR.dtd.tr
+ || block.name in CKEDITOR.dtd.$listItem ) )
+ return false;
+
var lastChild = lastNoneSpaceChild( block );
@@ -54,5 +63,5 @@
trimFillers( block, true );
- if ( blockNeedsExtension( block ) )
+ if ( blockNeedsExtension( block, true ) )
{
if ( CKEDITOR.env.ie )
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/indent/plugin.js (revision 6075)
@@ -79,7 +79,7 @@
// Returns the CSS property to be used for identing a given element.
- function getIndentCssProperty( element )
- {
- return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';
+ function getIndentCssProperty( element, dir )
+ {
+ return ( dir || element.getComputedStyle( 'direction' ) ) == 'ltr' ? 'margin-left' : 'margin-right';
}
@@ -158,6 +158,5 @@
// Convert the array back to a DOM forest (yes we might have a few subtrees now).
// And replace the old list with the new forest.
- var newListDir = listNode.getAttribute( 'dir' ) || listNode.getStyle( 'direction' );
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, newListDir );
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, listNode.getDirection() );
// Avoid nested - after outdent even they're visually same,
@@ -221,5 +220,5 @@
}
- function indentElement( element )
+ function indentElement( element, dir )
{
if ( element.getCustomData( 'indent_processed' ) )
@@ -257,5 +256,5 @@
else
{
- var indentCssProperty = getIndentCssProperty( element ),
+ var indentCssProperty = getIndentCssProperty( element, dir ),
currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
if ( isNaN( currentOffset ) )
@@ -329,8 +328,6 @@
if ( nearestListBlock )
{
- var firstListItem = nearestListBlock.getFirst( function( node )
- {
- return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
- }),
+ var firstListItem = nearestListBlock.getFirst( isListItem ),
+ hasMultipleItems = !!firstListItem.getNext( isListItem ),
rangeStart = range.startContainer,
indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
@@ -340,5 +337,5 @@
if ( !( indentWholeList &&
( self.name == 'indent' || self.useIndentClasses || parseInt( nearestListBlock.getStyle( getIndentCssProperty( nearestListBlock ) ), 10 ) ) &&
- indentElement( nearestListBlock ) ) )
+ indentElement( nearestListBlock, !hasMultipleItems && firstListItem.getDirection() ) ) )
indentList( nearestListBlock );
}
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/list/plugin.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/list/plugin.js (revision 6075)
@@ -89,4 +89,5 @@
{
rootNode = listArray[ currentIndex ].parent.clone( false, 1 );
+ dir && rootNode.setAttribute( 'dir', dir );
retval.append( rootNode );
}
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/listblock/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/listblock/plugin.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/listblock/plugin.js (revision 6075)
@@ -94,5 +94,5 @@
pendingHtml.push(
- '
- ' +
+ '
- ' +
' is also captured,
- // but we must stop the even propagation, otherwise
- // it's not possible to place the caret inside of it (non IE and IE9).
- if ( document.addEventListener )
- {
- textarea.on( 'mousedown', function( evt )
- {
- evt.data.stopPropagation();
- } );
}
Index: /CKEditor/branches/versions/3.5.x/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/branches/versions/3.5.x/_source/plugins/toolbar/plugin.js (revision 6074)
+++ /CKEditor/branches/versions/3.5.x/_source/plugins/toolbar/plugin.js (revision 6075)
@@ -160,5 +160,5 @@
var labelId = CKEDITOR.tools.getNextId();
- var output = [ '