Skip to content

Commit

Permalink
Merge branch 't/11123' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Nov 12, 2013
2 parents 9c5820a + 72a0c35 commit 509c10d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -53,6 +53,7 @@ Fixed Issues:
* [#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.
* [#11129](http://dev.ckeditor.com/ticket/11129): Pagebreak is lost when loading data.
* [#11123](http://dev.ckeditor.com/ticket/11123): Firefox: widget is destroyed after being dragged outside `body`.

## CKEditor 4.3 Beta

Expand Down
3 changes: 2 additions & 1 deletion plugins/widget/plugin.js
Expand Up @@ -1905,7 +1905,8 @@
editor.on( 'contentDom', function() {
var editable = editor.editable();

editable.attachListener( editable, 'drop', function( evt ) {
// #11123 Firefox needs to listen on document, because otherwise event won't be fired.
editable.attachListener( editable.isInline() ? editable : editor.document, 'drop', function( evt ) {
var dataStr = evt.data.$.dataTransfer.getData( 'text' ),
dataObj,
sourceWidget;
Expand Down

0 comments on commit 509c10d

Please sign in to comment.