Explorar o código

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

Maciej Gołaszewski %!s(int64=7) %!d(string=hai) anos
pai
achega
8acd3e7713

+ 1 - 1
packages/ckeditor5-block-quote/package.json

@@ -26,7 +26,7 @@
     "@ckeditor/ckeditor5-paragraph": "^10.0.4",
     "@ckeditor/ckeditor5-paragraph": "^10.0.4",
     "@ckeditor/ckeditor5-typing": "^11.0.2",
     "@ckeditor/ckeditor5-typing": "^11.0.2",
     "eslint": "^5.5.0",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.7",
+    "eslint-config-ckeditor5": "^1.0.9",
     "husky": "^0.14.3",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.0"
     "lint-staged": "^7.0.0"
   },
   },

+ 2 - 1
packages/ckeditor5-block-quote/tests/blockquotecommand.js

@@ -31,7 +31,8 @@ describe( 'BlockQuoteCommand', () => {
 
 
 				model.schema.extend( 'widget', {
 				model.schema.extend( 'widget', {
 					allowIn: '$root',
 					allowIn: '$root',
-					isLimit: true
+					isLimit: true,
+					isObject: true
 				} );
 				} );
 				model.schema.extend( '$text', { allowIn: 'widget' } );
 				model.schema.extend( '$text', { allowIn: 'widget' } );