Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into t/ckeditor5/1341
Browse files Browse the repository at this point in the history
  • Loading branch information
@jodator
jodator committed Jan 22, 2019
2 parents 59129d2 + b86a6d3 commit 53129f6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/utils.js
View file
Expand Up @@ -321,5 +321,5 @@ function addSelectionHandler( editable, writer ) {

// Append the selection handler into the widget wrapper.
writer.insert( writer.createPositionAt( editable, 0 ), selectionHandler );
writer.addClass( [ 'ck-widget_selectable' ], editable );
writer.addClass( [ 'ck-widget_with-selection-handler' ], editable );
}
2 changes: 1 addition & 1 deletion tests/utils.js
View file
Expand Up @@ -105,7 +105,7 @@ describe( 'widget utils', () => {
it( 'should add element a selection handler to widget if hasSelectionHandler=true is passed', () => {
toWidget( element, writer, { hasSelectionHandler: true } );

expect( element.hasClass( 'ck-widget_selectable' ) ).to.be.true;
expect( element.hasClass( 'ck-widget_with-selection-handler' ) ).to.be.true;

const selectionHandler = element.getChild( 0 );
expect( selectionHandler ).to.be.instanceof( UIElement );
Expand Down
32 changes: 16 additions & 16 deletions tests/widget.js
View file
Expand Up @@ -1236,11 +1236,11 @@ describe( 'Widget', () => {
viewDocument.fire( 'mousedown', domEventDataMock );

expect( getViewData( view ) ).to.equal(
'[<div class="ck-widget ck-widget_selectable ck-widget_selected" contenteditable="false">' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'[<div class="ck-widget ck-widget_selected ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck ck-widget__selection-handler"></div>' +
Expand Down Expand Up @@ -1268,19 +1268,19 @@ describe( 'Widget', () => {
viewDocument.fire( 'mousedown', domEventDataMock );

expect( getViewData( view ) ).to.equal(
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'[<div class="ck-widget ck-widget_selectable ck-widget_selected" contenteditable="false">' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'[<div class="ck-widget ck-widget_selected ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>]' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>'
);
Expand All @@ -1304,9 +1304,9 @@ describe( 'Widget', () => {
viewDocument.fire( 'mousedown', domEventDataMock );

expect( getViewData( view ) ).to.equal(
'[<div class="ck-widget ck-widget_selectable ck-widget_selected" contenteditable="false">' +
'[<div class="ck-widget ck-widget_selected ck-widget_with-selection-handler" contenteditable="false">' +
'<figcaption contenteditable="true">foo bar</figcaption>' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck ck-widget__selection-handler"></div>' +
Expand Down Expand Up @@ -1334,12 +1334,12 @@ describe( 'Widget', () => {
viewDocument.fire( 'mousedown', domEventDataMock );

expect( getViewData( view ) ).to.equal(
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'[<div class="ck-widget ck-widget_selectable ck-widget_selected" contenteditable="false">' +
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'[<div class="ck-widget ck-widget_selected ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>' +
'<div class="ck ck-widget__selection-handler"></div>' +
Expand All @@ -1364,9 +1364,9 @@ describe( 'Widget', () => {
viewDocument.fire( 'mousedown', domEventDataMock );

expect( getViewData( view ) ).to.equal(
'<div class="ck-widget ck-widget_selectable" contenteditable="false">' +
'<div class="ck-widget ck-widget_with-selection-handler" contenteditable="false">' +
'<figcaption contenteditable="true">' +
'[<div class="ck-widget ck-widget_selectable ck-widget_selected" contenteditable="false">' +
'[<div class="ck-widget ck-widget_selected ck-widget_with-selection-handler" contenteditable="false">' +
'<div class="ck ck-widget__selection-handler"></div>' +
'</div>]' +
'</figcaption>' +
Expand Down
2 changes: 1 addition & 1 deletion theme/widget.css
View file
Expand Up @@ -3,7 +3,7 @@
* For licensing, see LICENSE.md.
*/

.ck .ck-widget.ck-widget_selectable {
.ck .ck-widget.ck-widget_with-selection-handler {
/* Make the widget wrapper a relative positioning container for the drag handler. */
position: relative;

Expand Down

0 comments on commit 53129f6

Please sign in to comment.