Skip to content
Permalink
Browse files

Merge branch 't/12009'

  • Loading branch information...
oleq committed Jun 10, 2014
2 parents 0fa56b0 + 9f92c72 commit 902757f1e0982e414845bd061fe144ca3ad992e3
Showing with 22 additions and 2 deletions.
  1. +1 −0 CHANGES.md
  2. +2 −1 plugins/magicline/plugin.js
  3. +19 −1 tests/plugins/magicline/widgets.js
@@ -12,6 +12,7 @@ Fixed Issues:
* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/Webkit] Fixed: No widget's entries in context menu on widget right-click.
* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog are not translated.
* [#11980](http://dev.ckeditor.com/ticket/11980): [Blink/Webkit] Fixed: Span elements created while joining adjacent elements (non-collapsed selection).
* [#12009](http://dev.ckeditor.com/ticket/12009): [Nested widgets] Integration with Magicline plugin.

## CKEditor 4.4.1

@@ -479,7 +479,8 @@
// If trigger is an element, neither editable nor editable's ascendant.
if ( trigger && that.editable.contains( trigger ) ) {
// Check for closest editable limit.
var limit = getClosestEditableLimit( trigger, true );
// Don't consider trigger as a limit as it may be nested editable (includeSelf=false) (#12009).
var limit = getClosestEditableLimit( trigger );

// Trigger in nested editable area.
if ( limit.getAttribute( 'contenteditable' ) == 'true' )
@@ -22,6 +22,12 @@
'<div class="zb">zb</div>' +
'</div>' +
'</div>' ),
nestedTpl2 = new CKEDITOR.template( '<div id="{id}" class="z">' +
'<div class="nested">' +
'<p>foo</p>' +
'</div>' +
'</div>' +
'<p>bar</p>' ),

editor, doc;

@@ -35,8 +41,9 @@
'div.z { background: orange; overflow: hidden; height: 100px; } ' +
'div.z > div { background: white; margin: 5px; } ' +
'div.z > div > div { height: 45px; outline: 1px solid black; } ' +
'div.z > div > .za { background: green; } ' +
'div.z > div > .za { background: green; } ' +
'div.z > div > .zb { background: violet; } ' +
'div.z > div > p { height: 90px }' +

'div.w { background: orange; overflow: hidden; height: 100px; } ' +
'div.w > div { height: 50px; } ' +
@@ -520,6 +527,17 @@
}
}
} ),
'test nested, edge[bottom] - nested editable as a last child': t( nestedTpl2.output( { id: 'z' } ), {
that: {
mouse: { x: 10, y: 90 },
element: function() {
return w( 'z' ).parts.nested;
}
},
trigger: {
name: 'triggerEdge'
}
} ),
'test nested, expand - two blocks in nested': t( nestedTpl.output( { id: 'z' } ), {
that: {
mouse: { x: 10, y: 50 },

0 comments on commit 902757f

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