浏览代码

Merge branch 'master' into t/1210

Szymon Kupś 8 年之前
父节点
当前提交
f27378592b

+ 2 - 2
packages/ckeditor5-engine/package.json

@@ -21,10 +21,10 @@
     "@ckeditor/ckeditor5-typing": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-undo": "^1.0.0-alpha.2",
     "@ckeditor/ckeditor5-widget": "^1.0.0-alpha.2",
-    "eslint": "^4.8.0",
+    "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
-    "lint-staged": "^4.2.3"
+    "lint-staged": "^6.0.0"
   },
   "engines": {
     "node": ">=6.0.0",

+ 1 - 1
packages/ckeditor5-engine/tests/conversion/view-selection-to-model-converters.js

@@ -120,7 +120,7 @@ describe( 'convertSelectionChange', () => {
 
 		const spy = sinon.spy();
 
-		model.on( 'changesDone', spy );
+		model.on( 'change', spy );
 
 		convertSelection( null, { newSelection: viewSelection } );
 

+ 2 - 8
packages/ckeditor5-engine/tests/dev-utils/enableenginedebug.js

@@ -5,7 +5,7 @@
 
 import { default as enableEngineDebug, disableEngineDebug } from '../../src/dev-utils/enableenginedebug';
 import Editor from '@ckeditor/ckeditor5-core/src/editor/editor';
-import StandardEditor from '@ckeditor/ckeditor5-core/src/editor/standardeditor';
+import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 
 import ModelPosition from '../../src/model/position';
@@ -51,8 +51,6 @@ import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
 
 testUtils.createSinonSandbox();
 
-/* global document */
-
 describe( 'enableEngineDebug', () => {
 	afterEach( () => {
 		disableEngineDebug();
@@ -105,8 +103,6 @@ describe( 'disableEngineDebug', () => {
 describe( 'debug tools', () => {
 	let DebugPlugin, log, error;
 
-	class TestEditor extends StandardEditor {}
-
 	before( () => {
 		log = sinon.spy();
 		error = sinon.spy();
@@ -781,9 +777,7 @@ describe( 'debug tools', () => {
 		let editor;
 
 		beforeEach( () => {
-			const div = document.createElement( 'div' );
-
-			return TestEditor.create( div, {
+			return VirtualTestEditor.create( {
 				plugins: [ DebugPlugin ]
 			} ).then( _editor => {
 				editor = _editor;

+ 1 - 1
packages/ckeditor5-engine/tests/manual/nestededitable.js

@@ -75,7 +75,7 @@ ClassicEditor
 		toolbar: [ 'undo', 'redo' ]
 	} )
 	.then( editor => {
-		editor.model.document.on( 'changesDone', () => {
+		editor.model.document.on( 'change', () => {
 			printModelContents( editor );
 		} );