8
0
Просмотр исходного кода

Merge branch 'master' into t/ckeditor5/578

Aleksander Nowodzinski 7 лет назад
Родитель
Сommit
e30a2eece1

+ 1 - 1
packages/ckeditor5-widget/README.md

@@ -14,7 +14,7 @@ This package implements the widget API for CKEditor 5.
 
 ## Documentation
 
-See the [`@ckeditor/ckeditor5-widget` package](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/api/widget.html) page in [CKEditor 5 documentation](https://ckeditor5.github.io/docs/nightly/ckeditor5/latest/).
+See the [`@ckeditor/ckeditor5-widget` package](https://docs.ckeditor.com/ckeditor5/latest/api/widget.html) page in [CKEditor 5 documentation](https://docs.ckeditor.com/ckeditor5/latest/).
 
 ## License
 

+ 2 - 2
packages/ckeditor5-widget/package.json

@@ -17,7 +17,7 @@
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
-    "lint-staged": "^6.0.0"
+    "lint-staged": "^7.0.0"
   },
   "engines": {
     "node": ">=6.0.0",
@@ -25,7 +25,7 @@
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "(GPL-2.0 OR LGPL-2.1 OR MPL-1.1)",
-  "homepage": "https://ckeditor5.github.io",
+  "homepage": "https://ckeditor.com",
   "bugs": "https://github.com/ckeditor/ckeditor5-widget/issues",
   "repository": {
     "type": "git",

+ 2 - 2
packages/ckeditor5-widget/src/utils.js

@@ -53,7 +53,7 @@ export function isWidget( element ) {
  */
 export function toWidget( element, writer, options = {} ) {
 	writer.setAttribute( 'contenteditable', 'false', element );
-	writer.addClass( WIDGET_CLASS_NAME, element );
+	writer.addClass( [ 'ck', WIDGET_CLASS_NAME ], element );
 	writer.setCustomProperty( widgetSymbol, true, element );
 	element.getFillerOffset = getFillerOffset;
 
@@ -143,7 +143,7 @@ export function getLabel( element ) {
  * @returns {module:engine/view/editableelement~EditableElement} Returns same element that was provided in `editable` param.
  */
 export function toWidgetEditable( editable, writer ) {
-	writer.addClass( [ 'ck-editor__editable', 'ck-editor__nested-editable' ], editable );
+	writer.addClass( [ 'ck', 'ck-editor__editable', 'ck-editor__nested-editable' ], editable );
 
 	// Set initial contenteditable value.
 	writer.setAttribute( 'contenteditable', editable.isReadOnly ? 'false' : 'true', editable );

+ 2 - 6
packages/ckeditor5-widget/src/widget.js

@@ -133,9 +133,7 @@ export default class Widget extends Plugin {
 		// Create model selection over widget.
 		const modelElement = editor.editing.mapper.toModelElement( element );
 
-		editor.model.change( () => {
-			this._setSelectionOverElement( modelElement );
-		} );
+		this._setSelectionOverElement( modelElement );
 	}
 
 	/**
@@ -242,9 +240,7 @@ export default class Widget extends Plugin {
 		const objectElement2 = this._getObjectElementNextToSelection( isForward );
 
 		if ( objectElement2 instanceof ModelElement && schema.isObject( objectElement2 ) ) {
-			model.change( () => {
-				this._setSelectionOverElement( objectElement2 );
-			} );
+			this._setSelectionOverElement( objectElement2 );
 
 			return true;
 		}

+ 1 - 1
packages/ckeditor5-widget/tests/utils.js

@@ -139,7 +139,7 @@ describe( 'widget utils', () => {
 		} );
 
 		it( 'should add proper class', () => {
-			expect( element.hasClass( 'ck-editor__editable', 'ck-editor__nested-editable' ) ).to.be.true;
+			expect( element.hasClass( 'ck', 'ck-editor__editable', 'ck-editor__nested-editable' ) ).to.be.true;
 		} );
 
 		it( 'should add proper contenteditable value when element is read-only - initialization', () => {

+ 7 - 7
packages/ckeditor5-widget/tests/widget.js

@@ -184,7 +184,7 @@ describe( 'Widget', () => {
 		setModelData( model, '[<widget>foo bar</widget>]' );
 
 		expect( getViewData( view ) ).to.equal(
-			'[<div class="ck-widget ck-widget_selected" contenteditable="false">foo bar<b></b></div>]'
+			'[<div class="ck ck-widget ck-widget_selected" contenteditable="false">foo bar<b></b></div>]'
 		);
 		expect( viewDocument.selection.isFake ).to.be.true;
 	} );
@@ -202,8 +202,8 @@ describe( 'Widget', () => {
 		expect( getViewData( view ) ).to.equal(
 			'[' +
 			'<p>foo</p>' +
-			'<div class="ck-widget ck-widget_selected" contenteditable="false"><b></b></div>' +
-			'<div class="ck-widget ck-widget_selected" contenteditable="false"><b></b></div>' +
+			'<div class="ck ck-widget ck-widget_selected" contenteditable="false"><b></b></div>' +
+			'<div class="ck ck-widget ck-widget_selected" contenteditable="false"><b></b></div>' +
 			']'
 		);
 	} );
@@ -218,7 +218,7 @@ describe( 'Widget', () => {
 		setModelData( model, '<paragraph>foo</paragraph>[<widget>foo</widget>]' );
 
 		expect( getViewData( view ) ).to.equal(
-			'<p>foo</p>[<div class="ck-widget ck-widget_selected" contenteditable="false">foo<b></b></div>]'
+			'<p>foo</p>[<div class="ck ck-widget ck-widget_selected" contenteditable="false">foo<b></b></div>]'
 		);
 
 		model.change( writer => {
@@ -226,7 +226,7 @@ describe( 'Widget', () => {
 		} );
 
 		expect( getViewData( view ) ).to.equal(
-			'<p>{}foo</p><div class="ck-widget" contenteditable="false">foo<b></b></div>'
+			'<p>{}foo</p><div class="ck ck-widget" contenteditable="false">foo<b></b></div>'
 		);
 	} );
 
@@ -234,7 +234,7 @@ describe( 'Widget', () => {
 		setModelData( model, '<widget><editable>foo bar</editable></widget><editable>[baz]</editable>' );
 
 		expect( getViewData( view ) ).to.equal(
-			'<div class="ck-widget" contenteditable="false">' +
+			'<div class="ck ck-widget" contenteditable="false">' +
 				'<figcaption contenteditable="true">foo bar</figcaption>' +
 				'<b></b>' +
 			'</div>' +
@@ -676,7 +676,7 @@ describe( 'Widget', () => {
 				'<paragraph>foo</paragraph>[<widget></widget>]<paragraph>bar</paragraph>',
 				{ keyCode: keyCodes.a, ctrlKey: true },
 				'[<paragraph>foo</paragraph><widget></widget><paragraph>bar</paragraph>]',
-				'[<p>foo</p><div class="ck-widget ck-widget_selected" contenteditable="false"><b></b></div><p>bar</p>]'
+				'[<p>foo</p><div class="ck ck-widget ck-widget_selected" contenteditable="false"><b></b></div><p>bar</p>]'
 
 			);
 		} );