8
0
Просмотр исходного кода

Merge pull request #11 from ckeditor/t/6

Other: CKFinder should require CKFinder upload adapter plugin. Closes #6.
Piotrek Koszuliński 7 лет назад
Родитель
Сommit
1c64171d6c

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

@@ -10,6 +10,7 @@
     "ckeditor5-plugin"
   ],
   "dependencies": {
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^10.0.3",
     "@ckeditor/ckeditor5-core": "^11.0.1",
     "@ckeditor/ckeditor5-ui": "^11.1.0",
     "@ckeditor/ckeditor5-widget": "^10.3.0"

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

@@ -11,6 +11,7 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 
 import CKFinderUI from './ckfinderui';
 import CKFinderEditing from './ckfinderediting';
+import CKFinderUploadAdapter from '@ckeditor/ckeditor5-adapter-ckfinder/src/uploadadapter';
 
 /**
  * The CKFinder feature.
@@ -34,7 +35,7 @@ export default class CKFinder extends Plugin {
 	 * @inheritDoc
 	 */
 	static get requires() {
-		return [ CKFinderEditing, CKFinderUI ];
+		return [ CKFinderEditing, CKFinderUI, CKFinderUploadAdapter ];
 	}
 }
 

+ 5 - 0
packages/ckeditor5-ckfinder/tests/ckfinder.js

@@ -9,6 +9,7 @@ import global from '@ckeditor/ckeditor5-utils/src/dom/global';
 import CKFinder from '../src/ckfinder';
 import CKFinderUI from '../src/ckfinderui';
 import CKFinderEditing from '../src/ckfinderediting';
+import CKFinderUploadAdapter from '@ckeditor/ckeditor5-adapter-ckfinder/src/uploadadapter';
 
 describe( 'CKFinder', () => {
 	let editorElement, editor;
@@ -44,6 +45,10 @@ describe( 'CKFinder', () => {
 		expect( editor.plugins.get( CKFinderEditing ) ).to.instanceOf( CKFinderEditing );
 	} );
 
+	it( 'should load AdapterCKFinder plugin', () => {
+		expect( editor.plugins.get( CKFinderUploadAdapter ) ).to.instanceOf( CKFinderUploadAdapter );
+	} );
+
 	it( 'has proper name', () => {
 		expect( CKFinder.pluginName ).to.equal( 'CKFinder' );
 	} );

+ 4 - 0
packages/ckeditor5-ckfinder/tests/manual/ckfinder.js

@@ -20,6 +20,10 @@ ClassicEditor
 		toolbar: [ 'heading', '|', 'undo', 'redo', 'ckfinder' ],
 		image: {
 			toolbar: [ 'imageStyle:full', 'imageStyle:side', '|', 'imageTextAlternative' ]
+		},
+		ckfinder: {
+			// eslint-disable-next-line max-len
+			uploadUrl: 'https://cksource.com/weuy2g4ryt278ywiue/core/connector/php/connector.php?command=QuickUpload&type=Files&responseType=json'
 		}
 	} )
 	.then( editor => {