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

Merge branch 'master' into t/ckeditor5-engine/660

Aleksander Nowodzinski 8 лет назад
Родитель
Сommit
a7b095e0d0

+ 2 - 1
packages/ckeditor5-enter/README.md

@@ -1,6 +1,7 @@
-CKEditor 5 Enter Feature
+CKEditor 5 enter feature
 ========================================
 ========================================
 
 
+[![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-enter.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-enter)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-enter.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-enter)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-enter.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-enter)
 [![Build Status](https://travis-ci.org/ckeditor/ckeditor5-enter.svg?branch=master)](https://travis-ci.org/ckeditor/ckeditor5-enter)
 [![Test Coverage](https://codeclimate.com/github/ckeditor/ckeditor5-enter/badges/coverage.svg)](https://codeclimate.com/github/ckeditor/ckeditor5-enter/coverage)
 [![Test Coverage](https://codeclimate.com/github/ckeditor/ckeditor5-enter/badges/coverage.svg)](https://codeclimate.com/github/ckeditor/ckeditor5-enter/coverage)

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

@@ -15,7 +15,7 @@
     "@ckeditor/ckeditor5-heading": "^0.9.1",
     "@ckeditor/ckeditor5-heading": "^0.9.1",
     "@ckeditor/ckeditor5-typing": "^0.9.1",
     "@ckeditor/ckeditor5-typing": "^0.9.1",
     "@ckeditor/ckeditor5-undo": "^0.8.1",
     "@ckeditor/ckeditor5-undo": "^0.8.1",
-    "eslint-config-ckeditor5": "^1.0.0",
+    "eslint-config-ckeditor5": "^1.0.5",
     "gulp": "^3.9.1",
     "gulp": "^3.9.1",
     "guppy-pre-commit": "^0.4.0"
     "guppy-pre-commit": "^0.4.0"
   },
   },

+ 8 - 7
packages/ckeditor5-enter/tests/enter.js

@@ -12,13 +12,14 @@ describe( 'Enter feature', () => {
 	let editor, editingView;
 	let editor, editingView;
 
 
 	beforeEach( () => {
 	beforeEach( () => {
-		return VirtualTestEditor.create( {
-			plugins: [ Enter ]
-		} )
-		.then( newEditor => {
-			editor = newEditor;
-			editingView = editor.editing.view;
-		} );
+		return VirtualTestEditor
+			.create( {
+				plugins: [ Enter ]
+			} )
+			.then( newEditor => {
+				editor = newEditor;
+				editingView = editor.editing.view;
+			} );
 	} );
 	} );
 
 
 	it( 'creates the commands', () => {
 	it( 'creates the commands', () => {

+ 11 - 10
packages/ckeditor5-enter/tests/manual/enter.js

@@ -13,13 +13,14 @@ import Undo from '@ckeditor/ckeditor5-undo/src/undo';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
 import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
 
 
-ClassicEditor.create( document.querySelector( '#editor' ), {
-	plugins: [ Enter, Typing, Heading, Undo, Bold, Italic ],
-	toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
-} )
-.then( editor => {
-	window.editor = editor;
-} )
-.catch( err => {
-	console.error( err.stack );
-} );
+ClassicEditor
+	.create( document.querySelector( '#editor' ), {
+		plugins: [ Enter, Typing, Heading, Undo, Bold, Italic ],
+		toolbar: [ 'headings', 'bold', 'italic', 'undo', 'redo' ]
+	} )
+	.then( editor => {
+		window.editor = editor;
+	} )
+	.catch( err => {
+		console.error( err.stack );
+	} );