Sfoglia il codice sorgente

Used mix helper instead of Object.assign in Toolbar editor bindings.

Aleksander Nowodzinski 9 anni fa
parent
commit
48fb2136f2

+ 2 - 1
packages/ckeditor5-ui/src/bindings/stickytoolbar.js

@@ -5,6 +5,7 @@
 
 'use strict';
 
+import mix from '../../utils/mix.js';
 import ToolbarBindingsMixin from './toolbarbindingsmixin.js';
 import BaseStickyToolbar from '../toolbar/sticky/stickytoolbar.js';
 
@@ -31,4 +32,4 @@ export default class StickyToolbar extends BaseStickyToolbar {
 	}
 }
 
-Object.assign( StickyToolbar.prototype, ToolbarBindingsMixin );
+mix( StickyToolbar, ToolbarBindingsMixin );

+ 2 - 1
packages/ckeditor5-ui/src/bindings/toolbar.js

@@ -5,6 +5,7 @@
 
 'use strict';
 
+import mix from '../../utils/mix.js';
 import ToolbarBindingsMixin from './toolbarbindingsmixin.js';
 import BaseToolbar from '../toolbar/toolbar.js';
 
@@ -31,4 +32,4 @@ export default class Toolbar extends BaseToolbar {
 	}
 }
 
-Object.assign( Toolbar.prototype, ToolbarBindingsMixin );
+mix( Toolbar, ToolbarBindingsMixin );

+ 12 - 4
packages/ckeditor5-ui/tests/bindings/toolbarbindingsmixin.js

@@ -7,6 +7,7 @@
 
 'use strict';
 
+import mix from '/ckeditor5/utils/mix.js';
 import Editor from '/ckeditor5/editor/editor.js';
 import Controller from '/ckeditor5/ui/controller.js';
 import ControllerCollection from '/ckeditor5/ui/controllercollection.js';
@@ -18,11 +19,18 @@ describe( 'ToolbarBindingsMixin', () => {
 	beforeEach( () => {
 		editor = new Editor();
 
-		mixinInstance = new Controller();
-		mixinInstance.collections.add( new ControllerCollection( 'buttons' ) );
-		mixinInstance.editor = editor;
+		class MixClass extends Controller {
+			constructor( model, view ) {
+				super( model, view );
+
+				this.collections.add( new ControllerCollection( 'buttons' ) );
+			}
+		}
 
-		Object.assign( mixinInstance, ToolbarBindingsMixin );
+		mix( MixClass, ToolbarBindingsMixin );
+
+		mixinInstance = new MixClass();
+		mixinInstance.editor = editor;
 	} );
 
 	describe( 'addButtons', () => {