From 5f2c4cbf5cc68ab57ae6aecd2fa1e716a3730e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Go=C5=82aszewski?= Date: Wed, 31 Jan 2018 15:49:45 +0100 Subject: [PATCH 1/3] Changed: Rename `insertImage` UI button to `uploadImage`. --- tests/manual/easyimage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual/easyimage.js b/tests/manual/easyimage.js index bdd192d..5bd6f75 100644 --- a/tests/manual/easyimage.js +++ b/tests/manual/easyimage.js @@ -18,7 +18,7 @@ ClassicEditor tokenUrl: TOKEN_URL }, plugins: [ ArticlePluginSet, EasyImage ], - toolbar: [ 'headings', 'undo', 'redo', 'insertImage' ], + toolbar: [ 'headings', 'undo', 'redo', 'uploadImage' ], image: { toolbar: [ 'imageStyleFull', 'imageStyleSide', '|', 'imageTextAlternative' ] } From f9e86159f8b1382aef55340e810b83160b3cfb6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Go=C5=82aszewski?= Date: Wed, 31 Jan 2018 18:27:32 +0100 Subject: [PATCH 2/3] Change: Move `ImageUpload` feature to ckeditor5-image package. --- src/easyimage.js | 4 ++-- tests/easyimage.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/easyimage.js b/src/easyimage.js index b50f1bd..612a733 100644 --- a/src/easyimage.js +++ b/src/easyimage.js @@ -10,7 +10,7 @@ import Plugin from '@ckeditor/ckeditor5-core/src/plugin'; import CloudServicesUploadAdapter from './cloudservicesuploadadapter'; import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload'; +import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; /** * The Easy Image feature. @@ -18,7 +18,7 @@ import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload'; * This plugin enables: * * * {@link module:image/image~Image}, - * * {@link module:upload/imageupload~ImageUpload}, + * * {@link module:image/imageupload~ImageUpload}, * * {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter}. * * After enabling the Easy Image plugin you need to configure the Cloud Services integration through diff --git a/tests/easyimage.js b/tests/easyimage.js index ec595d2..3399982 100644 --- a/tests/easyimage.js +++ b/tests/easyimage.js @@ -8,7 +8,7 @@ import EasyImage from '../src/easyimage'; import CloudServicesUploadAdapter from '../src/cloudservicesuploadadapter'; import Image from '@ckeditor/ckeditor5-image/src/image'; -import ImageUpload from '@ckeditor/ckeditor5-upload/src/imageupload'; +import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload'; import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor'; import UploadGatewayMock from './_utils/uploadgatewaymock'; import { createNativeFileMock } from '@ckeditor/ckeditor5-upload/tests/_utils/mocks'; From 74962e645933b43192c1db1d0ba0299082819501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Go=C5=82aszewski?= Date: Thu, 1 Feb 2018 11:49:34 +0100 Subject: [PATCH 3/3] Changed: Renamed `FileRepository#createAdapter()` to `FileRepository#createUploadAdapter()`. --- src/cloudservicesuploadadapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cloudservicesuploadadapter.js b/src/cloudservicesuploadadapter.js index 4c8dac2..f782a2f 100644 --- a/src/cloudservicesuploadadapter.js +++ b/src/cloudservicesuploadadapter.js @@ -47,7 +47,7 @@ export default class CloudServicesUploadAdapter extends Plugin { this._uploadGateway = new CloudServicesUploadAdapter._UploadGateway( token, uploadUrl ); - editor.plugins.get( FileRepository ).createAdapter = loader => { + editor.plugins.get( FileRepository ).createUploadAdapter = loader => { return new Adapter( this._uploadGateway, loader ); }; }