8
0
فهرست منبع

Merge branch t/ckeditor5/550

Internal: Aligned code after ranaming ContextualToolbar to BallonToolbar. See ckeditor/ckeditor5#550.
Piotrek Koszuliński 8 سال پیش
والد
کامیت
c28da96ffc

+ 4 - 4
packages/ckeditor5-editor-balloon/src/ballooneditor.js

@@ -9,7 +9,7 @@
 
 import Editor from '@ckeditor/ckeditor5-core/src/editor/editor';
 import HtmlDataProcessor from '@ckeditor/ckeditor5-engine/src/dataprocessor/htmldataprocessor';
-import ContextualToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/contextual/contextualtoolbar';
+import BalloonToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/balloon/balloontoolbar';
 import BalloonEditorUI from './ballooneditorui';
 import BalloonEditorUIView from './ballooneditoruiview';
 import setDataInElement from '@ckeditor/ckeditor5-utils/src/dom/setdatainelement';
@@ -20,7 +20,7 @@ import mix from '@ckeditor/ckeditor5-utils/src/mix';
 
 /**
  * The {@glink builds/guides/overview#Balloon-editor balloon editor} implementation (Medium-like editor).
- * It uses an inline editable and a toolbar based on the {@link module:ui/toolbar/contextual/contextualtoolbar~ContextualToolbar}.
+ * It uses an inline editable and a toolbar based on the {@link module:ui/toolbar/balloon/balloontoolbar~BalloonToolbar}.
  * See the {@glink examples/builds/balloon-editor demo}.
  *
  * In order to create a balloon editor instance, use the static
@@ -62,8 +62,8 @@ export default class BalloonEditor extends Editor {
 
 		this.element = element;
 
-		this.config.get( 'plugins' ).push( ContextualToolbar );
-		this.config.define( 'contextualToolbar', this.config.get( 'toolbar' ) );
+		this.config.get( 'plugins' ).push( BalloonToolbar );
+		this.config.define( 'balloonToolbar', this.config.get( 'toolbar' ) );
 
 		this.data.processor = new HtmlDataProcessor();
 

+ 4 - 4
packages/ckeditor5-editor-balloon/src/ballooneditorui.js

@@ -51,7 +51,7 @@ export default class BalloonEditorUI {
 	init() {
 		const editor = this.editor;
 		const view = this.view;
-		const contextualToolbar = editor.plugins.get( 'ContextualToolbar' );
+		const balloonToolbar = editor.plugins.get( 'BalloonToolbar' );
 
 		view.render();
 
@@ -71,12 +71,12 @@ export default class BalloonEditorUI {
 			origin: editor.editing.view,
 			originFocusTracker: this.focusTracker,
 			originKeystrokeHandler: editor.keystrokes,
-			toolbar: contextualToolbar.toolbarView,
+			toolbar: balloonToolbar.toolbarView,
 			beforeFocus() {
-				contextualToolbar.show();
+				balloonToolbar.show();
 			},
 			afterBlur() {
-				contextualToolbar.hide();
+				balloonToolbar.hide();
 			}
 		} );
 	}

+ 6 - 6
packages/ckeditor5-editor-balloon/tests/ballooneditor.js

@@ -17,7 +17,7 @@ import BalloonEditor from '../src/ballooneditor';
 import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
 import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
 import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
-import ContextualToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/contextual/contextualtoolbar';
+import BalloonToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/balloon/balloontoolbar';
 import DataApiMixin from '@ckeditor/ckeditor5-core/src/editor/utils/dataapimixin';
 import ElementApiMixin from '@ckeditor/ckeditor5-core/src/editor/utils/elementapimixin';
 import RootElement from '@ckeditor/ckeditor5-engine/src/model/rootelement';
@@ -43,17 +43,17 @@ describe( 'BalloonEditor', () => {
 	describe( 'constructor()', () => {
 		beforeEach( () => {
 			editor = new BalloonEditor( editorElement, {
-				plugins: [ ContextualToolbar, Bold ],
+				plugins: [ BalloonToolbar, Bold ],
 				toolbar: [ 'Bold' ]
 			} );
 		} );
 
-		it( 'pushes ContextualToolbar to the list of plugins', () => {
-			expect( editor.config.get( 'plugins' ) ).to.include( ContextualToolbar );
+		it( 'pushes BalloonToolbar to the list of plugins', () => {
+			expect( editor.config.get( 'plugins' ) ).to.include( BalloonToolbar );
 		} );
 
-		it( 'pipes config#toolbar to config#contextualToolbar', () => {
-			expect( editor.config.get( 'contextualToolbar' ) ).to.have.members( [ 'Bold' ] );
+		it( 'pipes config#toolbar to config#balloonToolbar', () => {
+			expect( editor.config.get( 'balloonToolbar' ) ).to.have.members( [ 'Bold' ] );
 		} );
 
 		it( 'uses HTMLDataProcessor', () => {

+ 3 - 3
packages/ckeditor5-editor-balloon/tests/ballooneditorui.js

@@ -9,7 +9,7 @@ import ComponentFactory from '@ckeditor/ckeditor5-ui/src/componentfactory';
 import BalloonEditorUI from '../src/ballooneditorui';
 import BalloonEditorUIView from '../src/ballooneditoruiview';
 import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
-import ContextualToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/contextual/contextualtoolbar';
+import BalloonToolbar from '@ckeditor/ckeditor5-ui/src/toolbar/balloon/balloontoolbar';
 import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
 import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
 import utils from '@ckeditor/ckeditor5-utils/tests/_utils/utils';
@@ -20,7 +20,7 @@ describe( 'BalloonEditorUI', () => {
 	beforeEach( () => {
 		return VirtualBalloonTestEditor
 			.create( {
-				plugins: [ ContextualToolbar ]
+				plugins: [ BalloonToolbar ]
 			} )
 			.then( newEditor => {
 				editor = newEditor;
@@ -57,7 +57,7 @@ describe( 'BalloonEditorUI', () => {
 		} );
 
 		it( 'initializes keyboard navigation between view#toolbar and view#editable', () => {
-			const toolbar = editor.plugins.get( 'ContextualToolbar' );
+			const toolbar = editor.plugins.get( 'BalloonToolbar' );
 			const toolbarFocusSpy = sinon.stub( toolbar.toolbarView, 'focus' ).returns( {} );
 			const toolbarShowSpy = sinon.stub( toolbar, 'show' ).returns( {} );
 			const toolbarHideSpy = sinon.stub( toolbar, 'hide' ).returns( {} );