Selaa lähdekoodia

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

Maciej Gołaszewski 7 vuotta sitten
vanhempi
commit
2447211aeb

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

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

+ 1 - 1
packages/ckeditor5-ckfinder/src/ckfindercommand.js

@@ -57,7 +57,7 @@ export default class CKFinderCommand extends Command {
 			throw new CKEditorError( 'ckfinder-unknown-openerMethod: The openerMethod config option must by "popup" or "modal".' );
 		}
 
-		const options = Object.assign( {}, this.editor.config.get( 'ckfinder.options' ) );
+		const options = this.editor.config.get( 'ckfinder.options' ) || {};
 
 		options.chooseFiles = true;