8
0
Pārlūkot izejas kodu

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 gadi atpakaļ
vecāks
revīzija
412b0e613f

+ 7 - 0
packages/ckeditor5-upload/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## [10.0.4](https://github.com/ckeditor/ckeditor5-upload/compare/v10.0.3...v10.0.4) (2018-12-05)
+
+### Other changes
+
+* Updated translations. ([489b6fa](https://github.com/ckeditor/ckeditor5-upload/commit/489b6fa)) ([f435630](https://github.com/ckeditor/ckeditor5-upload/commit/f435630))
+
+
 ## [10.0.3](https://github.com/ckeditor/ckeditor5-upload/compare/v10.0.2...v10.0.3) (2018-10-08)
 
 ### Other changes

+ 1 - 1
packages/ckeditor5-upload/lang/translations/fr.po

@@ -7,4 +7,4 @@ msgstr ""
 
 msgctxt "A message that a file upload is in progress."
 msgid "Upload in progress"
-msgstr "Téléversement en cours"
+msgstr "Téléchargement en cours"

+ 10 - 0
packages/ckeditor5-upload/lang/translations/vi.po

@@ -0,0 +1,10 @@
+# Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+msgid ""
+msgstr ""
+"Language-Team: Vietnamese (https://www.transifex.com/ckeditor/teams/11143/vi/)\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgctxt "A message that a file upload is in progress."
+msgid "Upload in progress"
+msgstr "Đang tải lên"

+ 16 - 16
packages/ckeditor5-upload/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-upload",
-  "version": "10.0.3",
+  "version": "10.0.4",
   "description": "Upload Feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,24 +9,24 @@
     "ckeditor5-lib"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-engine": "^11.0.0",
-    "@ckeditor/ckeditor5-ui": "^11.1.0",
-    "@ckeditor/ckeditor5-utils": "^11.0.0"
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-engine": "^12.0.0",
+    "@ckeditor/ckeditor5-ui": "^11.2.0",
+    "@ckeditor/ckeditor5-utils": "^11.1.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^10.0.3",
-    "@ckeditor/ckeditor5-clipboard": "^10.0.3",
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
-    "@ckeditor/ckeditor5-enter": "^10.1.2",
-    "@ckeditor/ckeditor5-heading": "^10.1.0",
-    "@ckeditor/ckeditor5-image": "^11.0.0",
-    "@ckeditor/ckeditor5-list": "^11.0.2",
-    "@ckeditor/ckeditor5-paragraph": "^10.0.3",
-    "@ckeditor/ckeditor5-typing": "^11.0.1",
-    "@ckeditor/ckeditor5-undo": "^10.0.3",
+    "@ckeditor/ckeditor5-basic-styles": "^10.1.0",
+    "@ckeditor/ckeditor5-clipboard": "^10.0.4",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.2",
+    "@ckeditor/ckeditor5-enter": "^10.1.3",
+    "@ckeditor/ckeditor5-heading": "^10.1.1",
+    "@ckeditor/ckeditor5-image": "^12.0.0",
+    "@ckeditor/ckeditor5-list": "^11.0.3",
+    "@ckeditor/ckeditor5-paragraph": "^10.0.4",
+    "@ckeditor/ckeditor5-typing": "^11.0.2",
+    "@ckeditor/ckeditor5-undo": "^10.0.4",
     "eslint": "^5.5.0",
-    "eslint-config-ckeditor5": "^1.0.7",
+    "eslint-config-ckeditor5": "^1.0.9",
     "husky": "^0.14.3",
     "lint-staged": "^7.0.0"
   },

+ 12 - 53
packages/ckeditor5-upload/src/filerepository.js

@@ -26,9 +26,8 @@ import uid from '@ckeditor/ckeditor5-utils/src/uid.js';
  * To use it, first you need an upload adapter. Upload adapter's job is to handle communication with the server
  * (sending the file and handling server's response). You can use one of the existing plugins introducing upload adapters
  * (e.g. {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter} or
- * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one
- * (which boils down to setting the {@link ~FileRepository#createUploadAdapter} factory function – see
- * {@link module:upload/filerepository~UploadAdapter `UploadAdapter` interface} documentation).
+ * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}) or write your own one – see
+ * the {@glink framework/guides/deep-dive/upload-adapter "Custom image upload adpter" deep dive guide}.
  *
  * Then, you can use {@link module:upload/filerepository~FileRepository#createLoader `createLoader()`} and the returned
  * {@link module:upload/filerepository~FileLoader} instance to load and upload files.
@@ -156,25 +155,17 @@ export default class FileRepository extends Plugin {
 			 *
 			 * **If you see this warning when using one of the {@glink builds/index CKEditor 5 Builds}**
 			 * it means that you did not configure any of the upload adapters available by default in those builds.
-			 * See:
 			 *
-			 * * {@link module:core/editor/editorconfig~EditorConfig#cloudServices `config.cloudServices`} for
-			 * Easy Image with Cloud Services integration,
-			 * * {@link module:core/editor/editorconfig~EditorConfig#ckfinder `config.ckfinder`} for CKFinder
-			 * file upload integration.
+			 * See the {@glink features/image-upload/image-upload comprehensive "Image upload overview"} to learn which upload
+			 * adapters are available in the builds and how to configure them.
 			 *
 			 * **If you see this warning when using a custom build** there is a chance that you enabled
 			 * a feature like {@link module:image/imageupload~ImageUpload},
 			 * or {@link module:image/imageupload/imageuploadui~ImageUploadUI} but you did not enable any upload adapter.
-			 * You can choose one of the existing upload adapters:
+			 * You can choose one of the existing upload adapters listed in the
+			 * {@glink features/image-upload/image-upload "Image upload overview"}.
 			 *
-			 * * {@link module:easy-image/cloudservicesuploadadapter~CloudServicesUploadAdapter}
-			 * (remember to {@link module:core/editor/editorconfig~EditorConfig#cloudServices configure it})
-			 * * {@link module:adapter-ckfinder/uploadadapter~CKFinderUploadAdapter}
-			 * (remember to {@link module:core/editor/editorconfig~EditorConfig#ckfinder configure it})
-			 *
-			 * You can also implement your own upload adapter (in which case, please refer
-			 * to the {@link module:upload/filerepository~UploadAdapter `UploadAdapter` interface} documentation).
+			 * You can also implement your {@glink framework/guides/deep-dive/upload-adapter own image upload adapter}.
 			 *
 			 * @error filerepository-no-upload-adapter
 			 */
@@ -487,44 +478,12 @@ class FileLoader {
 mix( FileLoader, ObservableMixin );
 
 /**
- * Upload adapter interface used by FileRepository to handle file upload. Upload adapter is a bridge between the editor and server that
- * handles file uploads. It should contain logic necessary to initiate upload process and monitor its progress.
- *
- * It should implement two methods:
- *
- * * {@link module:upload/filerepository~UploadAdapter#upload `upload()`},
- * * {@link module:upload/filerepository~UploadAdapter#abort `abort()`}.
- *
- * Example upload adapter implementation:
- *
- *		class UploadAdapter {
- *			constructor( loader ) {
- *				// Save Loader instance to update upload progress.
- *				this.loader = loader;
- *			}
- *
- *			upload() {
- *				// Update loader's progress.
- *				server.onUploadProgress( data => {
- *					loader.uploadTotal = data.total;
- *					loader.uploaded = data.uploaded;
- *				} ):
- *
- *				// Return promise that will be resolved when file is uploaded.
- *				return server.upload( loader.file );
- *			}
- *
- *			abort() {
- *				// Reject promise returned from upload() method.
- *				server.abortUpload();
- *			}
- *		}
- *
- * Then upload adapter can be set to be used by {@link module:upload/filerepository~FileRepository FileRepository}:
+ * Upload adapter interface used by the {@link module:upload/filerepository~FileRepository file repository}
+ * to handle file upload. An upload adapter is a bridge between the editor and server that handles file uploads.
+ * It should contain a logic necessary to initiate an upload process and monitor its progress.
  *
- *		editor.plugins.get( 'FileRepository' ).createUploadAdapter = function( loader ) {
- *			return new UploadAdapter( loader );
- *		};
+ * Learn how to develop your own upload adapter for CKEditor 5 in the
+ * {@glink framework/guides/deep-dive/upload-adapter "Custom upload adapter" guide}.
  *
  * @interface UploadAdapter
  */