Преглед на файлове

Merge branch 'master' into t/ckeditor5/447

Aleksander Nowodzinski преди 8 години
родител
ревизия
4281c95a2c

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

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

+ 13 - 12
packages/ckeditor5-list/tests/listengine.js

@@ -26,18 +26,19 @@ describe( 'ListEngine', () => {
 	let editor, modelDoc, modelRoot, viewDoc, viewRoot;
 
 	beforeEach( () => {
-		return VirtualTestEditor.create( {
-			plugins: [ Clipboard, BoldEngine, Paragraph, ListEngine, UndoEngine ]
-		} )
-		.then( newEditor => {
-			editor = newEditor;
-
-			modelDoc = editor.document;
-			modelRoot = modelDoc.getRoot();
-
-			viewDoc = editor.editing.view;
-			viewRoot = viewDoc.getRoot();
-		} );
+		return VirtualTestEditor
+			.create( {
+				plugins: [ Clipboard, BoldEngine, Paragraph, ListEngine, UndoEngine ]
+			} )
+			.then( newEditor => {
+				editor = newEditor;
+
+				modelDoc = editor.document;
+				modelRoot = modelDoc.getRoot();
+
+				viewDoc = editor.editing.view;
+				viewRoot = viewDoc.getRoot();
+			} );
 	} );
 
 	it( 'should be loaded', () => {

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

@@ -14,13 +14,14 @@ import Undo from '@ckeditor/ckeditor5-undo/src/undo';
 import Clipboard from '@ckeditor/ckeditor5-clipboard/src/clipboard';
 import List from '../../src/list';
 
-ClassicEditor.create( document.querySelector( '#editor' ), {
-	plugins: [ Enter, Typing, Heading, Paragraph, Undo, List, Clipboard ],
-	toolbar: [ 'headings', 'bulletedList', 'numberedList', 'undo', 'redo' ]
-} )
-.then( editor => {
-	window.editor = editor;
-} )
-.catch( err => {
-	console.error( err.stack );
-} );
+ClassicEditor
+	.create( document.querySelector( '#editor' ), {
+		plugins: [ Enter, Typing, Heading, Paragraph, Undo, List, Clipboard ],
+		toolbar: [ 'headings', 'bulletedList', 'numberedList', 'undo', 'redo' ]
+	} )
+	.then( editor => {
+		window.editor = editor;
+	} )
+	.catch( err => {
+		console.error( err.stack );
+	} );

+ 13 - 12
packages/ckeditor5-list/tests/manual/nestedlists.js

@@ -15,15 +15,16 @@ import Clipboard from '@ckeditor/ckeditor5-clipboard/src/clipboard';
 import Link from '@ckeditor/ckeditor5-link/src/link';
 import List from '../../src/list';
 
-ClassicEditor.create( document.querySelector( '#editor' ), {
-	plugins: [ Enter, Typing, Heading, Paragraph, Undo, List, Clipboard, Link ],
-	toolbar: [ 'headings', 'bulletedList', 'numberedList', 'undo', 'redo' ]
-} )
-.then( editor => {
-	window.editor = editor;
-	window.modelRoot = editor.document.getRoot();
-	window.viewRoot = editor.editing.view.getRoot();
-} )
-.catch( err => {
-	console.error( err.stack );
-} );
+ClassicEditor
+	.create( document.querySelector( '#editor' ), {
+		plugins: [ Enter, Typing, Heading, Paragraph, Undo, List, Clipboard, Link ],
+		toolbar: [ 'headings', 'bulletedList', 'numberedList', 'undo', 'redo' ]
+	} )
+	.then( editor => {
+		window.editor = editor;
+		window.modelRoot = editor.document.getRoot();
+		window.viewRoot = editor.editing.view.getRoot();
+	} )
+	.catch( err => {
+		console.error( err.stack );
+	} );