file upload buttons

js-src/ckeditor5-build-classic/plugins/eeuploadadapter/src/eeuploadadapter.js

@@ -55,6 +55,10 @@ export default class EEUploadAdapter extends Plugin {
  if (!options) {
  return;
  }
+ options.uploadLocationId = this.editor.config.get('defaultdir');
+ if (!options.uploadLocationId) {
+ return;
+ }
  if (!options.uploadUrl) {
  /**
  * The {@link module:upload/uploadconfig~SimpleUploadConfig#uploadUrl `config.simpleUpload.uploadUrl`}
@@ -133,7 +137,7 @@ class Adapter {
  if (!response || response.error) {
  return reject(response && response.error ? response.error : genericErrorText);
  }
- const urls = response.path ? { default: response.path } : response.urls;
+ const urls = response.path ? { default: response.path } : response.url ? { default: response.url } : response.urls;
  // Resolve with the normalized `urls` property and pass the rest of the response
  // to allow customizing the behavior of features relying on the upload adapters.
  resolve({

js-src/ckeditor5-build-classic/plugins/filemanager/src/filemanagercommand.js

@@ -87,6 +87,9 @@ export default class FileManagerCommand extends Command {
  }
  };
 
+ options.directories = this.editor.config.get('directories');
+ options.defaultdir = this.editor.config.get('defaultdir');
+
  function pickFile(evt) {
  const file = evt.detail;
  if (Object.prototype.toString.call(file) === '[object String]') {

js-src/ckeditor5-build-classic/src/ckeditor.js

@@ -18,7 +18,7 @@ import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock';
 import Subscript from '@ckeditor/ckeditor5-basic-styles/src/subscript';
 import Superscript from '@ckeditor/ckeditor5-basic-styles/src/superscript';
 import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote';
-import { Image, ImageInsert, AutoImage, ImageCaption, ImageStyle, ImageToolbar, ImageResize, ImageUpload } from '@ckeditor/ckeditor5-image';
+import { Image, ImageInsert, AutoImage, ImageCaption, ImageStyle, ImageToolbar, ImageResize, ImageUpload, ImageUtils } from '@ckeditor/ckeditor5-image';
 import Indent from '@ckeditor/ckeditor5-indent/src/indent';
 import IndentBlock from '@ckeditor/ckeditor5-indent/src/indentblock';
 import Link from '@ckeditor/ckeditor5-link/src/link';
@@ -79,6 +79,7 @@ ClassicEditor.builtinPlugins = [
  ImageToolbar,
  ImageResize,
  ImageInsert,
+ ImageUpload,
  AutoImage,
  Indent,
  IndentBlock,