Merge branch 'master' into t/ckeditor5-ui/262

ckeditor · Nov 2, 2017 · ef71bd0 · ef71bd0
2 parents 070157b + 970be95
commit ef71bd0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 34 deletions.
diff --git a/docs/_snippets/examples/balloon-editor.js b/docs/_snippets/examples/balloon-editor.js
@@ -6,17 +6,17 @@
 /* globals console, window, document */
 
 import BalloonEditor from '@ckeditor/ckeditor5-build-balloon/src/ckeditor';
-import getToken from '@ckeditor/ckeditor5-easy-image/tests/_utils/gettoken';
 
-getToken()
-	.then( token => {
-		return BalloonEditor
-			.create( document.querySelector( '#snippet-balloon-editor' ), {
-				cloudServices: { token }
-			} )
-			.then( editor => {
-				window.editor = editor;
-			} );
+import { TOKEN_URL } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
+
+BalloonEditor
+	.create( document.querySelector( '#snippet-balloon-editor' ), {
+		cloudServices: {
+			tokenUrl: TOKEN_URL
+		}
+	} )
+	.then( editor => {
+		window.editor = editor;
 	} )
 	.catch( err => {
 		console.error( err );

diff --git a/docs/_snippets/examples/classic-editor.js b/docs/_snippets/examples/classic-editor.js
@@ -5,20 +5,19 @@
 
 /* globals ClassicEditor, console, window, document */
 
-import getToken from '@ckeditor/ckeditor5-easy-image/tests/_utils/gettoken';
+import { TOKEN_URL } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
 
-getToken()
-	.then( token => {
-		return ClassicEditor
-			.create( document.querySelector( '#snippet-classic-editor' ), {
-				cloudServices: { token },
-				toolbar: {
-					viewportTopOffset: 60
-				}
-			} )
-			.then( editor => {
-				window.editor = editor;
-			} );
+ClassicEditor
+	.create( document.querySelector( '#snippet-classic-editor' ), {
+		cloudServices: {
+			tokenUrl: TOKEN_URL
+		},
+		toolbar: {
+			viewportTopOffset: 60
+		}
+	} )
+	.then( editor => {
+		window.editor = editor;
 	} )
 	.catch( err => {
 		console.error( err );

diff --git a/docs/_snippets/examples/inline-editor.js b/docs/_snippets/examples/inline-editor.js
@@ -6,7 +6,7 @@
 /* globals console, window, document */
 
 import InlineEditor from '@ckeditor/ckeditor5-build-inline/src/ckeditor';
-import getToken from '@ckeditor/ckeditor5-easy-image/tests/_utils/gettoken';
+import { TOKEN_URL } from '@ckeditor/ckeditor5-cloudservices/tests/_utils/cloudservices-config';
 
 const inlineInjectElements = document.querySelectorAll( '#snippet-inline-editor [data-inline-inject]' );
 
@@ -18,6 +18,9 @@ Array.from( inlineInjectElements ).forEach( inlineElement => {
 		},
 		toolbar: {
 			viewportTopOffset: 60
+		},
+		cloudServices: {
+			tokenUrl: TOKEN_URL
 		}
 	};
 
@@ -36,15 +39,10 @@ Array.from( inlineInjectElements ).forEach( inlineElement => {
 		config.toolbar.items = [ 'headings', 'bold', 'italic', 'link' ];
 	}
 
-	getToken()
-		.then( token => {
-			config.cloudServices = { token };
-
-			return InlineEditor
-				.create( inlineElement, config )
-				.then( editor => {
-					window.editor = editor;
-				} );
+	InlineEditor
+		.create( inlineElement, config )
+		.then( editor => {
+			window.editor = editor;
 		} )
 		.catch( err => {
 			console.error( err );

diff --git a/docs/features/image-upload.md b/docs/features/image-upload.md
@@ -50,7 +50,7 @@ To make enabling image upload in CKEditor 5 a breeze, by default all builds incl
 	ClassicCreator
 		.create( document.querySelector( '#editor' ), {
 			cloudServices: {
-				token: 'token-retrieved-from-the-cs-token-server'
+				tokenUrl: 'http://url-to-retrieve-token.example.com/'
 			}
 		} )
 		.then( ... )