Bladeren bron

Merge branch 'master' into t/ckeditor5/1477-docs

Aleksander Nowodzinski 6 jaren geleden
bovenliggende
commit
f4ba510e42

+ 8 - 4
packages/ckeditor5-core/package.json

@@ -41,7 +41,7 @@
     "@ckeditor/ckeditor5-ui": "^11.2.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.9",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "lint-staged": "^7.0.0"
   },
   "engines": {
@@ -62,8 +62,7 @@
     "theme"
   ],
   "scripts": {
-    "lint": "eslint --quiet '**/*.js'",
-    "precommit": "lint-staged"
+    "lint": "eslint --quiet '**/*.js'"
   },
   "lint-staged": {
     "**/*.js": [
@@ -73,5 +72,10 @@
   "eslintIgnore": [
     "src/lib/**",
     "packages/**"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  }
 }

+ 5 - 4
packages/ckeditor5-core/tests/_utils-tests/classictesteditor.js

@@ -57,7 +57,7 @@ describe( 'ClassicTestEditor', () => {
 			expect( editor.ui ).to.be.instanceOf( EditorUI );
 			expect( editor.ui.view ).to.be.instanceOf( BoxedEditorUIView );
 			expect( editor.ui.view.isRendered ).to.be.false;
-			expect( editor.ui.view.editableElement ).to.be.undefined;
+			expect( editor.ui.getEditableElement() ).to.be.undefined;
 		} );
 
 		it( 'creates main root element', () => {
@@ -89,11 +89,12 @@ describe( 'ClassicTestEditor', () => {
 		it( 'renders the view including #editable and sets #editableElement', () => {
 			return ClassicTestEditor.create( editorElement, { foo: 1 } )
 				.then( editor => {
-					const view = editor.ui.view;
+					const ui = editor.ui;
+					const view = ui.view;
 
 					expect( view.isRendered ).to.be.true;
-					expect( view.editableElement.tagName ).to.equal( 'DIV' );
-					expect( view.editableElement ).to.equal( view.editable.element );
+					expect( ui.getEditableElement().tagName ).to.equal( 'DIV' );
+					expect( ui.getEditableElement() ).to.equal( view.editable.element );
 				} );
 		} );
 

+ 0 - 1
packages/ckeditor5-core/tests/_utils/classictesteditor.js

@@ -109,7 +109,6 @@ class ClassicTestEditorUI extends EditorUI {
 
 		view.render();
 		view.main.add( view.editable );
-		view.editableElement = view.editable.element;
 
 		this._editableElements.set( 'main', view.editable.element );