Browse Source

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 years ago
parent
commit
6faf6614f0

+ 5 - 0
packages/ckeditor5-editor-balloon/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## [11.0.2](https://github.com/ckeditor/ckeditor5-editor-balloon/compare/v11.0.1...v11.0.2) (2018-12-05)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [11.0.1](https://github.com/ckeditor/ckeditor5-editor-balloon/compare/v11.0.0...v11.0.1) (2018-10-08)
 
 Internal changes only (updated dependencies, documentation, etc.).

+ 10 - 10
packages/ckeditor5-editor-balloon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-editor-balloon",
-  "version": "11.0.1",
+  "version": "11.0.2",
   "description": "Balloon editor implementation for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,19 +9,19 @@
     "ckeditor5-editor"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-engine": "^11.0.0",
-    "@ckeditor/ckeditor5-theme-lark": "^11.1.0",
-    "@ckeditor/ckeditor5-ui": "^11.1.0",
-    "@ckeditor/ckeditor5-utils": "^11.0.0",
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-engine": "^12.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^12.0.0",
+    "@ckeditor/ckeditor5-ui": "^11.2.0",
+    "@ckeditor/ckeditor5-utils": "^11.1.0",
     "lodash-es": "^4.17.10"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
-    "@ckeditor/ckeditor5-essentials": "^10.1.2",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.3",
+    "@ckeditor/ckeditor5-basic-styles": "^10.1.0",
+    "@ckeditor/ckeditor5-essentials": "^10.1.3",
+    "@ckeditor/ckeditor5-paragraph": "^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"
   },

+ 4 - 1
packages/ckeditor5-editor-balloon/src/ballooneditor.js

@@ -67,7 +67,10 @@ export default class BalloonEditor extends Editor {
 			this.sourceElement = sourceElementOrData;
 		}
 
-		this.config.get( 'plugins' ).push( BalloonToolbar );
+		const plugins = this.config.get( 'plugins' );
+		plugins.push( BalloonToolbar );
+		this.config.set( 'plugins', plugins );
+
 		this.config.define( 'balloonToolbar', this.config.get( 'toolbar' ) );
 
 		this.data.processor = new HtmlDataProcessor();

+ 4 - 7
packages/ckeditor5-editor-balloon/tests/ballooneditor.js

@@ -10,9 +10,6 @@ import BalloonEditorUIView from '../src/ballooneditoruiview';
 
 import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
 
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-
 import BalloonEditor from '../src/ballooneditor';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
@@ -289,12 +286,12 @@ describe( 'BalloonEditor', () => {
 					schema.extend( 'heading', { allowIn: '$root' } );
 					schema.extend( '$text', { allowIn: 'heading' } );
 
-					editor.conversion.for( 'upcast' ).add( upcastElementToElement( { model: 'heading', view: 'heading' } ) );
-					editor.conversion.for( 'dataDowncast' ).add( downcastElementToElement( { model: 'heading', view: 'heading' } ) );
-					editor.conversion.for( 'editingDowncast' ).add( downcastElementToElement( {
+					editor.conversion.for( 'upcast' ).elementToElement( { model: 'heading', view: 'heading' } );
+					editor.conversion.for( 'dataDowncast' ).elementToElement( { model: 'heading', view: 'heading' } );
+					editor.conversion.for( 'editingDowncast' ).elementToElement( {
 						model: 'heading',
 						view: 'heading-editing-representation'
-					} ) );
+					} );
 				} );
 		} );