Index: /CKEditor/branches/versions/3.3.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5404) +++ /CKEditor/branches/versions/3.3.x/CHANGES.html (revision 5405) @@ -164,4 +164,13 @@
  • #5144 : [Chrome] Paste in webkit somtimes leaves extra 'div' element.
  • #5021 : [Firefox] Typing in empty document start from second line in enterMode=BR.
    • +
  • #5416 : [IE] Delete table throws a error when CKEDITOR.enterMode = CKEDITOR.ENTER_BR.
    • +
  • #4459 : [IE] Select element is penetrating the maximized editor in IE6.
    • +
  • #5559 : [IE] The first call of CKEDITOR.editor::setData is affected by iframe cache when loading wysiwyg mode.
    • +
  • #5567 : [IE] Remove inline styles in some case doesn't join identical siblings.
    • +
  • #4836 : Using SCAYT result in fragile elements when applying inline styles.
    • +
  • #5425 : [Opera] Disable SCAYT plugin for Opera browser.
    • +
  • #5450 : [FireFox] Press enter on 'replace' button result wrong.
    • +
  • #5121 : Recognizes the <br /> tag as a separator when apply block styles in enterMode=BR.
    • +
  • #5575 : CKEDITOR.replaceAll should consider all kind of white spaces between class names.
  • Updated the following language files:
    • -
  • #5416 : [IE] Delete table throws a error when CKEDITOR.enterMode = CKEDITOR.ENTER_BR.

    • Index: /CKEditor/branches/versions/3.3.x/_source/core/ckeditor_basic.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/core/ckeditor_basic.js (revision 5404) +++ /CKEditor/branches/versions/3.3.x/_source/core/ckeditor_basic.js (revision 5405) @@ -189,5 +189,5 @@ // parameter. - var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ); + var classRegex = new RegExp( '(?:^|\\s)' + arguments[0] + '(?:$|\\s)' ); if ( !classRegex.test( textarea.className ) ) Index: /CKEditor/branches/versions/3.3.x/_source/core/dom/element.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/core/dom/element.js (revision 5404) +++ /CKEditor/branches/versions/3.3.x/_source/core/dom/element.js (revision 5405) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -778,4 +778,29 @@ /** + * Whether it's an empty inline elements which has no visual impact when removed. + */ + isEmptyInlineRemoveable : function() + { + if ( !CKEDITOR.dtd.$removeEmpty[ this.getName() ] ) + return false; + + var children = this.getChildren(); + for ( var i = 0, count = children.count(); i < count; i++ ) + { + var child = children.getItem( i ); + + if ( child.type == CKEDITOR.NODE_ELEMENT && child.getAttribute( '_fck_bookmark' ) ) + continue; + + if ( child.type == CKEDITOR.NODE_ELEMENT && !child.isEmptyInlineRemoveable() + || child.type == CKEDITOR.NODE_TEXT && CKEDITOR.tools.trim( child.getText() ) ) + { + return false; + } + } + return true; + }, + + /** * Indicates that the element has defined attributes. * @returns {Boolean} True if the element has attributes. @@ -874,4 +899,54 @@ } }, + + mergeSiblings : ( function() + { + function mergeElements( element, sibling, isNext ) + { + if ( sibling && sibling.type == CKEDITOR.NODE_ELEMENT ) + { + // Jumping over bookmark nodes and empty inline elements, e.g. , + // queuing them to be moved later. (#5567) + var pendingNodes = []; + + while ( sibling.getAttribute( '_fck_bookmark' ) + || sibling.isEmptyInlineRemoveable() ) + { + pendingNodes.push( sibling ); + sibling = isNext ? sibling.getNext() : sibling.getPrevious(); + if ( !sibling || sibling.type != CKEDITOR.NODE_ELEMENT ) + return; + } + + if ( element.isIdentical( sibling ) ) + { + // Save the last child to be checked too, to merge things like + // => + var innerSibling = isNext ? element.getLast() : element.getFirst(); + + // Move pending nodes first into the target element. + while( pendingNodes.length ) + pendingNodes.shift().move( element, !isNext ); + + sibling.moveChildren( element, !isNext ); + sibling.remove(); + + // Now check the last inner child (see two comments above). + if ( innerSibling && innerSibling.type == CKEDITOR.NODE_ELEMENT ) + innerSibling.mergeSiblings(); + } + } + } + + return function() + { + // Merge empty links and anchors also. (#5567) + if ( !( CKEDITOR.dtd.$removeEmpty[ this.getName() ] || this.is( 'a' ) ) ) + return; + + mergeElements( this, this.getNext(), true ); + mergeElements( this, this.getPrevious() ); + } + } )(), /** Index: /CKEditor/branches/versions/3.3.x/_source/core/tools.js =================================================================== --- /CKEditor/branches/versions/3.3.x/_source/core/tools.js (revision 5404) +++ /CKEditor/branches/versions/3.3.x/_source/core/tools.js (revision 5405) @@ -256,5 +256,5 @@ /** - * Build the HTML snippet of a set of