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

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 лет назад
Родитель
Сommit
f0d0e14bed

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

@@ -1,6 +1,13 @@
 Changelog
 Changelog
 =========
 =========
 
 
+## [10.1.3](https://github.com/ckeditor/ckeditor5-enter/compare/v10.1.2...v10.1.3) (2018-12-05)
+
+### Bug fixes
+
+* `EnterCommand` will use `writer.split()` also at the beginning and at the end of a block. ([c159958](https://github.com/ckeditor/ckeditor5-enter/commit/c159958))
+
+
 ## [10.1.2](https://github.com/ckeditor/ckeditor5-enter/compare/v10.1.1...v10.1.2) (2018-10-08)
 ## [10.1.2](https://github.com/ckeditor/ckeditor5-enter/compare/v10.1.1...v10.1.2) (2018-10-08)
 
 
 ### Bug fixes
 ### Bug fixes

+ 11 - 11
packages/ckeditor5-enter/package.json

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

+ 4 - 6
packages/ckeditor5-enter/src/shiftenter.js

@@ -10,8 +10,6 @@
 import ShiftEnterCommand from './shiftentercommand';
 import ShiftEnterCommand from './shiftentercommand';
 import EnterObserver from './enterobserver';
 import EnterObserver from './enterobserver';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
-import { upcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/upcast-converters';
-import { downcastElementToElement } from '@ckeditor/ckeditor5-engine/src/conversion/downcast-converters';
 
 
 /**
 /**
  * This plugin handles the <kbd>Shift</kbd>+<kbd>Enter</kbd> keystroke (soft line break) in the editor.
  * This plugin handles the <kbd>Shift</kbd>+<kbd>Enter</kbd> keystroke (soft line break) in the editor.
@@ -44,16 +42,16 @@ export default class ShiftEnter extends Plugin {
 
 
 		// Configure converters.
 		// Configure converters.
 		conversion.for( 'upcast' )
 		conversion.for( 'upcast' )
-			.add( upcastElementToElement( {
+			.elementToElement( {
 				model: 'softBreak',
 				model: 'softBreak',
 				view: 'br'
 				view: 'br'
-			} ) );
+			} );
 
 
 		conversion.for( 'downcast' )
 		conversion.for( 'downcast' )
-			.add( downcastElementToElement( {
+			.elementToElement( {
 				model: 'softBreak',
 				model: 'softBreak',
 				view: ( modelElement, viewWriter ) => viewWriter.createEmptyElement( 'br' )
 				view: ( modelElement, viewWriter ) => viewWriter.createEmptyElement( 'br' )
-			} ) );
+			} );
 
 
 		view.addObserver( EnterObserver );
 		view.addObserver( EnterObserver );