Sfoglia il codice sorgente

Merge branch 'master' into t/ckeditor5/1096

Maciej Gołaszewski 7 anni fa
parent
commit
cac23a7cc8

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

@@ -28,7 +28,7 @@
     "@ckeditor/ckeditor5-undo": "^10.0.4",
     "@ckeditor/ckeditor5-undo": "^10.0.4",
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",
     "eslint-config-ckeditor5": "^1.0.9",
     "eslint-config-ckeditor5": "^1.0.9",
-    "husky": "^0.14.3",
+    "husky": "^1.3.1",
     "lint-staged": "^7.0.0"
     "lint-staged": "^7.0.0"
   },
   },
   "engines": {
   "engines": {
@@ -49,8 +49,7 @@
     "theme"
     "theme"
   ],
   ],
   "scripts": {
   "scripts": {
-    "lint": "eslint --quiet '**/*.js'",
-    "precommit": "lint-staged"
+    "lint": "eslint --quiet '**/*.js'"
   },
   },
   "lint-staged": {
   "lint-staged": {
     "**/*.js": [
     "**/*.js": [
@@ -60,5 +59,10 @@
   "eslintIgnore": [
   "eslintIgnore": [
     "src/lib/**",
     "src/lib/**",
     "packages/**"
     "packages/**"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  }
 }
 }

+ 1 - 1
packages/ckeditor5-typing/tests/manual/nbsp.js

@@ -22,7 +22,7 @@ ClassicEditor
 
 
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
 		editor.model.schema.extend( '$text', { allowIn: '$root' } );
 
 
-		const editable = editor.ui.view.editableElement;
+		const editable = editor.ui.getEditableElement();
 
 
 		document.querySelector( '#nbsp' ).addEventListener( 'click', () => {
 		document.querySelector( '#nbsp' ).addEventListener( 'click', () => {
 			editor.model.change( writer => {
 			editor.model.change( writer => {