Skip to content

Commit

Permalink
Merge branch 't/11110' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Nov 8, 2013
2 parents c3e8a80 + a18bfd1 commit bfd1038
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -51,6 +51,7 @@ Fixed Issues:
* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widgets drag and drop, because of seriously buggy native `range#moveToPoint` method.
* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed wrong selection position after undoing widget drag and drop.
* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed iframe and flash object being incorrectly pasted in certain conditions.

## CKEditor 4.3 Beta

Expand Down
6 changes: 6 additions & 0 deletions plugins/fakeobjects/plugin.js
Expand Up @@ -54,6 +54,12 @@
var plugin = CKEDITOR.plugins.add( 'fakeobjects', {
lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%

init: function( editor ) {
// Allow image with all styles and classes plus src, alt and title attributes.
// We need them when fakeobject is pasted.
editor.filter.allow( 'img[!data-cke-realelement,src,alt,title](*){*}', 'fakeobjects' );
},

afterInit: function( editor ) {
var dataProcessor = editor.dataProcessor,
htmlFilter = dataProcessor && dataProcessor.htmlFilter;
Expand Down
4 changes: 4 additions & 0 deletions plugins/image2/plugin.js
Expand Up @@ -495,6 +495,10 @@
name = el.name,
image;

// #11110 Don't initialize on pasted fake objects.
if ( el.attributes[ 'data-cke-realelement' ] )
return;

// If a center wrapper is found. So the element is:
// <div style="text-align:center"><figure>...</figure></div>.
// Centering is done by widget.wrapper in such case. Hence, replace
Expand Down

0 comments on commit bfd1038

Please sign in to comment.