瀏覽代碼

Other: The plugin will not log a warning when `config.ckfinder.uploadUrl` is not specified (because `FileRepository` will do it itself). Closes #5.

Piotrek Koszuliński 8 年之前
父節點
當前提交
2446c564c1

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

@@ -8,8 +8,7 @@
   ],
   "dependencies": {
     "@ckeditor/ckeditor5-core": "^0.9.0",
-    "@ckeditor/ckeditor5-upload": "^0.2.0",
-    "@ckeditor/ckeditor5-utils": "^0.10.0"
+    "@ckeditor/ckeditor5-upload": "^0.2.0"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-basic-styles": "^0.9.0",

+ 1 - 7
packages/ckeditor5-adapter-ckfinder/src/uploadadapter.js

@@ -12,7 +12,6 @@
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import { getCsrfToken } from './utils';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 
 /**
  * A plugin that enables CKFinder uploads in CKEditor 5.
@@ -49,12 +48,7 @@ export default class CKFinderUploadAdapter extends Plugin {
 		const url = this.editor.config.get( 'ckfinder.uploadUrl' );
 
 		if ( !url ) {
-			/**
-			 * Please provide `ckfinder.uploadUrl` config option.
-			 *
-			 * @error ckfinder-upload-adapter-no-config
-			 */
-			log.warn( 'ckfinder-upload-adapter-no-config: Please provide "ckfinder.uploadUrl" config option.' );
+			return;
 		}
 
 		// Register CKFinderAdapter

+ 9 - 9
packages/ckeditor5-adapter-ckfinder/tests/uploadadapter.js

@@ -11,7 +11,6 @@ import CKFinderUploadAdapter from '../src/uploadadapter';
 import FileRepository from '@ckeditor/ckeditor5-upload/src/filerepository';
 import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks';
 import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
-import log from '@ckeditor/ckeditor5-utils/src/log';
 
 describe( 'CKFinderUploadAdapter', () => {
 	let editor, sinonXHR;
@@ -60,21 +59,22 @@ describe( 'CKFinderUploadAdapter', () => {
 			expect( adapter.abort ).to.be.a( 'function' );
 		} );
 
-		it( 'should log warning when there is no configuration', () => {
+		it( 'should not set the FileRepository.createAdapter factory if not configured', () => {
 			const editorElement = document.createElement( 'div' );
 			document.body.appendChild( editorElement );
-			const warnSub = testUtils.sinon.stub( log, 'warn' );
 
 			return ClassicTestEditor
 				.create( editorElement, {
 					plugins: [ Image, ImageUpload, CKFinderUploadAdapter ],
 				} )
-				.then( () => {
-					sinon.assert.calledOnce( warnSub );
-					sinon.assert.calledWithExactly(
-						warnSub,
-						'ckfinder-upload-adapter-no-config: Please provide "ckfinder.uploadUrl" config option.'
-					);
+				.then( editor => {
+					const fileRepository = editor.plugins.get( FileRepository );
+
+					expect( fileRepository ).to.not.have.property( 'createAdapter' );
+
+					editorElement.remove();
+
+					return editor.destroy();
 				} );
 		} );