Skip to content
Permalink
Browse files

Merge branch 't/11237'

  • Loading branch information...
Reinmar committed Dec 5, 2013
2 parents 18df3e2 + 7847133 commit 37761cfa4a22f197b6da0d0225394cd12020a77f
Showing with 6 additions and 12 deletions.
  1. +1 −0 CHANGES.md
  2. +5 −12 core/htmlparser/filter.js
@@ -31,6 +31,7 @@ Fixed Issues:
* [#11042](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and combo items will now cycle.
* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: Method applyStyle removes attributes from nested elements.
* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: editor.destroy() does not cleanup content generated by [TableResize plugin](http://ckeditor.com/addon/tableresize) for inline editors.
* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute's value is deleted when pasting content from MS Word.

## CKEditor 4.3

@@ -338,23 +338,16 @@
return ret;

// We're filtering node (element/fragment).
if ( isNode ) {
// No further filtering if it's not anymore
// fitable for the subsequent filters.
if ( ret && ( ret.name != orgName || ret.type != orgType ) )
return ret;
}
// Filtering value (nodeName/textValue/attrValue).
else {
// No further filtering if it's not any more values.
if ( typeof ret != 'string' )
return ret;
}
// No further filtering if it's not anymore fitable for the subsequent filters.
if ( isNode && ret && ( ret.name != orgName || ret.type != orgType ) )
return ret;

// Update currentValue and corresponding argument in args array.
// Updated values will be used in next for-loop step.
if ( ret != undefined )
args[ 0 ] = currentValue = ret;

// ret == undefined will continue loop as nothing has happened.
}
}

0 comments on commit 37761cf

Please sign in to comment.
You can’t perform that action at this time.