Przeglądaj źródła

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 lat temu
rodzic
commit
30ad2a7ea1

+ 7 - 0
packages/ckeditor5-paragraph/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## [10.0.4](https://github.com/ckeditor/ckeditor5-paragraph/compare/v10.0.3...v10.0.4) (2018-12-05)
+
+### Other changes
+
+* Improved SVG icons size. See [ckeditor/ckeditor5-theme-lark#206](https://github.com/ckeditor/ckeditor5-theme-lark/issues/206). ([a9f440f](https://github.com/ckeditor/ckeditor5-paragraph/commit/a9f440f))
+
+
 ## [10.0.3](https://github.com/ckeditor/ckeditor5-paragraph/compare/v10.0.2...v10.0.3) (2018-10-08)
 
 Internal changes only (updated dependencies, documentation, etc.).

+ 14 - 14
packages/ckeditor5-paragraph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-paragraph",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "description": "Paragraph feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -10,22 +10,22 @@
     "ckeditor5-plugin"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-ui": "^11.1.0",
-    "@ckeditor/ckeditor5-utils": "^11.0.0"
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-ui": "^11.2.0",
+    "@ckeditor/ckeditor5-utils": "^11.1.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
-    "@ckeditor/ckeditor5-clipboard": "^10.0.3",
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
-    "@ckeditor/ckeditor5-engine": "^11.0.0",
-    "@ckeditor/ckeditor5-enter": "^10.1.2",
-    "@ckeditor/ckeditor5-heading": "^10.1.0",
-    "@ckeditor/ckeditor5-link": "^10.0.4",
-    "@ckeditor/ckeditor5-typing": "^11.0.1",
-    "@ckeditor/ckeditor5-undo": "^10.0.3",
+    "@ckeditor/ckeditor5-basic-styles": "^10.1.0",
+    "@ckeditor/ckeditor5-clipboard": "^10.0.4",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.2",
+    "@ckeditor/ckeditor5-engine": "^12.0.0",
+    "@ckeditor/ckeditor5-enter": "^10.1.3",
+    "@ckeditor/ckeditor5-heading": "^10.1.1",
+    "@ckeditor/ckeditor5-link": "^10.1.0",
+    "@ckeditor/ckeditor5-typing": "^11.0.2",
+    "@ckeditor/ckeditor5-undo": "^10.0.4",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.7",
+    "eslint-config-ckeditor5": "^1.0.9",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.0"
   },

+ 10 - 13
packages/ckeditor5-paragraph/tests/paragraph.js

@@ -13,9 +13,6 @@ import {
 } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
 import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement, upcastElementToAttribute } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-
 import ModelDocumentFragment from '@ckeditor/ckeditor5-engine/src/model/documentfragment';
 import ModelText from '@ckeditor/ckeditor5-engine/src/model/text';
 
@@ -81,8 +78,8 @@ describe( 'Paragraph feature', () => {
 				editor.model.schema.register( 'span', { allowWhere: '$text' } );
 				editor.model.schema.extend( '$text', { allowIn: 'span' } );
 
-				editor.conversion.for( 'downcast' ).add( downcastElementToElement( { model: 'span', view: 'span' } ) );
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'span', view: 'span' } ) );
+				editor.conversion.for( 'downcast' ).elementToElement( { model: 'span', view: 'span' } );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'span', view: 'span' } );
 
 				editor.setData( '<span>foo</span>' );
 
@@ -109,7 +106,7 @@ describe( 'Paragraph feature', () => {
 			it( 'should autoparagraph text next to allowed element', () => {
 				model.schema.register( 'heading1', { inheritAllFrom: '$block' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'heading1', view: 'h1' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'heading1', view: 'h1' } );
 
 				const modelFragment = editor.data.parse( '<h1>foo</h1>bar<p>bom</p>' );
 
@@ -136,7 +133,7 @@ describe( 'Paragraph feature', () => {
 				model.schema.extend( 'div', { allowIn: '$root' } );
 				model.schema.extend( 'paragraph', { allowIn: 'div' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'div', view: 'div' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'div', view: 'div' } );
 
 				const modelFragment = editor.data.parse( '<div>foo</div><div>bom<p>bim</p></div>' );
 
@@ -150,7 +147,7 @@ describe( 'Paragraph feature', () => {
 			it( 'should autoparagraph text inside disallowed element next to allowed element', () => {
 				model.schema.register( 'heading1', { inheritAllFrom: '$block' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'heading1', view: 'h1' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'heading1', view: 'h1' } );
 
 				const modelFragment = editor.data.parse( '<div><h1>foo</h1>bar</div>' );
 
@@ -161,7 +158,7 @@ describe( 'Paragraph feature', () => {
 			it( 'should not autoparagraph text in disallowed element', () => {
 				model.schema.register( 'heading1', { inheritAllFrom: '$block' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'heading1', view: 'h1' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'heading1', view: 'h1' } );
 
 				const modelFragment = editor.data.parse( '<h1><b>foo</b>bar</h1>' );
 
@@ -204,7 +201,7 @@ describe( 'Paragraph feature', () => {
 				beforeEach( () => {
 					model.schema.extend( '$text', { allowAttributes: 'bold' } );
 
-					editor.conversion.for( 'upcast' ).add( upcastElementToAttribute( { view: 'b', model: 'bold' } ) );
+					editor.conversion.for( 'upcast' ).elementToAttribute( { view: 'b', model: 'bold' } );
 				} );
 
 				it( 'inside document fragment', () => {
@@ -217,7 +214,7 @@ describe( 'Paragraph feature', () => {
 					model.schema.register( 'blockQuote', { allowIn: '$root' } );
 					model.schema.extend( '$block', { allowIn: 'blockQuote' } );
 
-					editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'blockQuote', view: 'blockquote' } ) );
+					editor.conversion.for( 'upcast' ).elementToElement( { model: 'blockQuote', view: 'blockquote' } );
 
 					const modelFragment = editor.data.parse( '<blockquote>foo<b>bar</b>bom</blockquote>' );
 
@@ -255,7 +252,7 @@ describe( 'Paragraph feature', () => {
 				model.schema.extend( 'div', { allowIn: 'specialRoot' } );
 				model.schema.extend( '$text', { allowIn: 'div' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'div', view: 'div' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'div', view: 'div' } );
 
 				const modelFragment = editor.data.parse( '<h1>foo</h1><h2>bar</h2><div>bom</div>', [ 'specialRoot' ] );
 
@@ -331,7 +328,7 @@ describe( 'Paragraph feature', () => {
 				model.schema.extend( 'div', { allowIn: '$root' } );
 				model.schema.extend( 'paragraph', { allowIn: 'div' } );
 
-				editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'div', view: 'div' } ) );
+				editor.conversion.for( 'upcast' ).elementToElement( { model: 'div', view: 'div' } );
 
 				const modelFragment = editor.data.parse( '<div><ul><li>foo</li><li>bar</li></ul></div><div>bom<p>bim</p></div>' );
 

+ 1 - 1
packages/ckeditor5-paragraph/theme/icons/paragraph.svg

@@ -1 +1 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg"><path d="M10.5 5.5H7v5h3.5a2.5 2.5 0 1 0 0-5zM5 3h6.5v.025a5 5 0 0 1 0 9.95V13H7v4a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z" fill="#2E2E2E" fill-rule="evenodd"/></svg>
+<svg viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M10.5 5.5H7v5h3.5a2.5 2.5 0 1 0 0-5zM5 3h6.5v.025a5 5 0 0 1 0 9.95V13H7v4a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z"/></svg>