Merge branch 'master' into t/ckeditor5/645

ckeditor · Feb 2, 2018 · 17e1a0c · 17e1a0c
2 parents b405a58 + d942074
commit 17e1a0c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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 );
 		};
 	}

diff --git a/src/easyimage.js b/src/easyimage.js
@@ -10,15 +10,15 @@
 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.
  *
  * 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
@@ -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';

diff --git 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' ]
 		}