Browse Source

Merge branch 'master' into ckeditor5/t/1214

Piotrek Koszuliński 7 years ago
parent
commit
1957b8ddea

+ 5 - 0
packages/ckeditor5-cloud-services/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## [10.1.1](https://github.com/ckeditor/ckeditor5-cloud-services/compare/v10.1.0...v10.1.1) (2018-12-05)
+
+Internal changes only (updated dependencies, documentation, etc.).
+
+
 ## [10.1.0](https://github.com/ckeditor/ckeditor5-cloud-services/compare/v10.0.2...v10.1.0) (2018-10-08)
 
 ### Features

+ 3 - 3
packages/ckeditor5-cloud-services/README.md

@@ -1,5 +1,5 @@
-CKEditor 5 Cloud Services
-=========================
+CKEditor 5's Cloud Services integration
+=======================================
 
 [![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-cloud-services.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloud-services)
@@ -14,7 +14,7 @@ CKEditor 5's [Cloud Services](https://ckeditor.com/ckeditor-cloud-services/) int
 
 ## Documentation
 
-See the [`@ckeditor/ckeditor5-cloud-services` package](https://ckeditor.com/docs/ckeditor5/latest/api/cloudservices.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).
+See the [`@ckeditor/ckeditor5-cloud-services` package](https://ckeditor.com/docs/ckeditor5/latest/api/cloud-services.html) page in [CKEditor 5 documentation](https://ckeditor.com/docs/ckeditor5/latest/).
 
 ## License
 

+ 26 - 0
packages/ckeditor5-cloud-services/docs/api/cloud-services.md

@@ -0,0 +1,26 @@
+---
+category: api-reference
+---
+
+# CKEditor 5 Cloud Services
+
+[![npm version](https://badge.fury.io/js/%40ckeditor%2Fckeditor5-cloud-services.svg)](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloud-services)
+
+CKEditor 5's [Cloud Services](https://ckeditor.com/ckeditor-cloud-services/) integration layer, which handles {@link module:cloud-services/cloudservices~CloudServicesConfig `config.cloudServices`} and tokens.
+
+## Installation
+
+```bash
+npm install --save @ckeditor/ckeditor5-cloud-services
+```
+
+## Contribute
+
+The source code of this package is available on GitHub in https://github.com/ckeditor/ckeditor5-cloud-services.
+
+## External links
+
+* [`@ckeditor/ckeditor5-cloud-services` on npm](https://www.npmjs.com/package/@ckeditor/ckeditor5-cloud-services)
+* [`ckeditor/ckeditor5-cloud-services` on GitHub](https://github.com/ckeditor/ckeditor5-cloud-services)
+* [Issue tracker](https://github.com/ckeditor/ckeditor5-cloud-services/issues)
+* [Changelog](https://github.com/ckeditor/ckeditor5-cloud-services/blob/master/CHANGELOG.md)

+ 5 - 5
packages/ckeditor5-cloud-services/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-cloud-services",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "description": "CKEditor 5's Cloud Services integration layer.",
   "keywords": [
     "ckeditor",
@@ -10,13 +10,13 @@
   ],
   "dependencies": {
     "@ckeditor/ckeditor-cloud-services-core": "^2.0.0",
-    "@ckeditor/ckeditor5-core": "^11.0.1",
-    "@ckeditor/ckeditor5-utils": "^11.0.0"
+    "@ckeditor/ckeditor5-core": "^11.1.0",
+    "@ckeditor/ckeditor5-utils": "^11.1.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-editor-classic": "^11.0.1",
+    "@ckeditor/ckeditor5-editor-classic": "^11.0.2",
     "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"
   },

+ 4 - 4
packages/ckeditor5-cloud-services/src/cloudservices.js

@@ -175,22 +175,22 @@ CloudServices.Token = Token;
  */
 
 /**
- * The URL for web socket communication, used by `CollaborativeEditing` plugin. Every customer (organization in the CKEditor
+ * The URL for web socket communication, used by `RealTimeCollaborativeEditing` plugin. Every customer (organization in the CKEditor
  * Ecosystem dashboard) has its own, unique URLs to communicate with CKEditor Cloud Services. The URL can be found in the
  * CKEditor Ecosystem dashboard.
  *
- * Note: unlike most plugins, `CollaborativeEditing` is not included in any CKEditor 5 build and has to be installed manually.
+ * Note: unlike most plugins, `RealTimeCollaborativeEditing` is not included in any CKEditor 5 build and has to be installed manually.
  * Check [Collaboration overview](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/overview.html) for more details.
  *
  * @member {String} module:cloud-services/cloudservices~CloudServicesConfig#webSocketUrl
  */
 
 /**
- * Document ID, used by `CollaborativeEditing` plugin. All editor instances created with the same document ID will collaborate.
+ * Document ID, used by `RealTimeCollaborativeEditing` plugin. All editor instances created with the same document ID will collaborate.
  * It means that each document needs a different document ID if you do not want to start collaboration between these documents.
  * The ID is usually a primary key of the document in the database, but you are free to provide whatever identifier fits your scenario.
  *
- * Note: unlike most plugins, `CollaborativeEditing` is not included in any CKEditor 5 build and has to be installed manually.
+ * Note: unlike most plugins, `RealTimeCollaborativeEditing` is not included in any CKEditor 5 build and has to be installed manually.
  * Check [Collaboration overview](https://ckeditor.com/docs/ckeditor5/latest/features/collaboration/overview.html) for more details.
  *
  * @member {String} module:cloud-services/cloudservices~CloudServicesConfig#documentId

+ 2 - 2
packages/ckeditor5-cloud-services/tests/manual/token.js

@@ -27,8 +27,8 @@ ClassicEditor
 		window.editor = editor;
 	} )
 	.catch( err => {
-		output.innerText = err.stack;
-		console.error( err.stack );
+		output.innerText = err.message;
+		console.error( err.message );
 	} );
 
 function handleRequest( xhr, resolve, reject ) {

+ 1 - 1
packages/ckeditor5-cloud-services/tests/manual/token.md

@@ -19,4 +19,4 @@
 **Expected result**
 * Editor isn't initialized at the start of the scenario.
 * The token is different than the previous token.
-* After clicking the button the editor doesn't initialize and there is an error in the output - `Error: Cannot download new token!`.
+* After clicking the button the editor doesn't initialize and there is an error in the output - `Cannot download new token!`.