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

ckeditor · Jul 5, 2017 · 165863f · 165863f
2 parents cde71fc + b806152
commit 165863f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/image.js b/src/image.js
@@ -34,15 +34,15 @@ export default class Image extends Plugin {
 	 * @inheritDoc
 	 */
 	static get pluginName() {
-		return 'image/image';
+		return 'Image';
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	init() {
 		const editor = this.editor;
-		const contextualToolbar = editor.plugins.get( 'ui/contextualtoolbar' );
+		const contextualToolbar = editor.plugins.get( 'ContextualToolbar' );
 
 		// If `ContextualToolbar` plugin is loaded, it should be disabled for images
 		// which have their own toolbar to avoid duplication.

diff --git a/src/imagecaption.js b/src/imagecaption.js
@@ -28,6 +28,6 @@ export default class ImageCaption extends Plugin {
 	 * @inheritDoc
 	 */
 	static get pluginName() {
-		return 'image/imagecaption';
+		return 'ImageCaption';
 	}
 }
diff --git a/src/imagestyle.js b/src/imagestyle.js
@@ -30,7 +30,7 @@ export default class ImageStyle extends Plugin {
 	 * @inheritDoc
 	 */
 	static get pluginName() {
-		return 'image/imagestyle';
+		return 'ImageStyle';
 	}
 
 	/**

diff --git a/src/imagetextalternative.js b/src/imagetextalternative.js
@@ -36,7 +36,7 @@ export default class ImageTextAlternative extends Plugin {
 	 * @inheritDoc
 	 */
 	static get pluginName() {
-		return 'image/imagetextalternative';
+		return 'ImageTextAlternative';
 	}
 
 	/**

diff --git a/src/imagetoolbar.js b/src/imagetoolbar.js
@@ -25,7 +25,7 @@ export default class ImageToolbar extends Plugin {
 	 * @inheritDoc
 	 */
 	static get pluginName() {
-		return 'image/imagetoolbar';
+		return 'ImageToolbar';
 	}
 
 	/**

diff --git a/tests/image.js b/tests/image.js
@@ -60,8 +60,8 @@ describe( 'Image', () => {
 			plugins: [ Image, ContextualToolbar, Paragraph ]
 		} )
 		.then( newEditor => {
-			const balloon = newEditor.plugins.get( 'ui/contextualballoon' );
-			const contextualToolbar = newEditor.plugins.get( 'ui/contextualtoolbar' );
+			const balloon = newEditor.plugins.get( 'ContextualBalloon' );
+			const contextualToolbar = newEditor.plugins.get( 'ContextualToolbar' );
 
 			newEditor.editing.view.isFocused = true;