Skip to content
Permalink
Browse files

Merge branch 't/12024' into major

  • Loading branch information...
Reinmar committed Jun 26, 2014
2 parents 3d09f34 + af841a1 commit f6148952a2da8425d4b4ed7abaecc7ca2a91da7a
Showing with 8 additions and 4 deletions.
  1. +2 −1 CHANGES.md
  2. +6 −3 plugins/widget/plugin.js
@@ -5,7 +5,8 @@ CKEditor 4 Changelog

Fixed Issues:

* [#12006](http://dev.ckeditor.com/ticket/12006): [Nested widgets] Drag and drop of nested block widgets.
* [#12024](http://dev.ckeditor.com/ticket/12024): [Nested widgets][FF] Fixed: Outline is extended to the left by unpositioned drag handlers.
* [#12006](http://dev.ckeditor.com/ticket/12006): [Nested widgets] Fixed: Drag and drop of nested block widgets.
* [#12008](http://dev.ckeditor.com/ticket/12008): Fixed various cases of inserting single non-editable element using [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method. Fixes pasting widget with nested editable inside other widget's nested editable.

## CKEditor 4.4.3
@@ -45,8 +45,10 @@
'width:' + DRAG_HANDLER_SIZE + 'px;' +
'height:0;' +
// Initially drag handler should not be visible, until its position will be
// repositioned. #11177
'left:-9999px;' +
// calculated (#11177).
// We need to hide unpositined handlers, so they don't extend
// widget's outline far to the left (#12024).
'display:none;' +
'opacity:0.75;' +
'transition:height 0s 0.2s;' + // Delay hiding drag handler.
// Prevent drag handler from being misplaced (#11198).
@@ -1382,7 +1384,8 @@
editor.fire( 'lockSnapshot' );
this.dragHandlerContainer.setStyles( {
top: newPos.y + 'px',
left: newPos.x + 'px'
left: newPos.x + 'px',
display: 'block'
} );
editor.fire( 'unlockSnapshot' );
!initialDirty && editor.resetDirty();

0 comments on commit f614895

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