8
0
Oskar Wrobel 9 лет назад
Родитель
Сommit
3c16c7b095

+ 2 - 2
packages/ckeditor5-ui/src/controller.js

@@ -8,7 +8,7 @@
 import Collection from '../utils/collection.js';
 import CKEditorError from '../utils/ckeditorerror.js';
 import EmitterMixin from '../utils/emittermixin.js';
-import utils from '../utils/utils.js';
+import mix from '../utils/mix.js';
 
 /**
  * Basic Controller class.
@@ -215,7 +215,7 @@ export default class Controller {
 	}
 }
 
-utils.mix( Controller, EmitterMixin );
+mix( Controller, EmitterMixin );
 
 /**
  * Fired when the controller is fully initialized.

+ 2 - 2
packages/ckeditor5-ui/src/domemittermixin.js

@@ -6,7 +6,7 @@
 'use strict';
 
 import EmitterMixin from '../utils/emittermixin.js';
-import utils from '../utils/utils.js';
+import uid from '../utils/uid.js';
 import extend from '../utils/lib/lodash/extend.js';
 import log from '../utils/log.js';
 
@@ -259,7 +259,7 @@ export default DOMEmitterMixin;
 // @param {Node} node
 // @return {Number} UID for given DOM Node.
 function getNodeUID( node ) {
-	return node[ 'data-ck-expando' ] || ( node[ 'data-ck-expando' ] = utils.uid() );
+	return node[ 'data-ck-expando' ] || ( node[ 'data-ck-expando' ] = uid() );
 }
 
 // Checks (naively) if given node is native DOM Node.

+ 2 - 2
packages/ckeditor5-ui/src/editorui/editorui.js

@@ -11,7 +11,7 @@ import ComponentFactory from '../componentfactory.js';
 import ObservableMixin from '../../utils/observablemixin.js';
 import IconManagerView from '../iconmanagerview.js';
 import iconManagerModel from '../../../theme/iconmanagermodel.js';
-import utils from '../../utils/utils.js';
+import mix from '../../utils/mix.js';
 
 /**
  * Base class for the editor main view controllers.
@@ -85,4 +85,4 @@ export default class EditorUI extends Controller {
 	}
 }
 
-utils.mix( EditorUI, ObservableMixin );
+mix( EditorUI, ObservableMixin );

+ 2 - 2
packages/ckeditor5-ui/src/model.js

@@ -6,7 +6,7 @@
 'use strict';
 
 import extend from '../utils/lib/lodash/extend.js';
-import utils from '../utils/utils.js';
+import mix from '../utils/mix.js';
 import ObservableMixin from '../utils/observablemixin.js';
 
 /**
@@ -35,4 +35,4 @@ export default class Model {
 	}
 }
 
-utils.mix( Model, ObservableMixin );
+mix( Model, ObservableMixin );

+ 2 - 2
packages/ckeditor5-ui/src/view.js

@@ -10,7 +10,7 @@ import Region from './region.js';
 import Template from './template.js';
 import CKEditorError from '../utils/ckeditorerror.js';
 import DOMEmitterMixin from './domemittermixin.js';
-import utils from '../utils/utils.js';
+import mix from '../utils/mix.js';
 import isPlainObject from '../utils/lib/lodash/isPlainObject.js';
 
 const bindToSymbol = Symbol( 'bindTo' );
@@ -637,7 +637,7 @@ export default class View {
 	}
 }
 
-utils.mix( View, DOMEmitterMixin );
+mix( View, DOMEmitterMixin );
 
 const validSelectorTypes = new Set( [ 'string', 'boolean', 'function' ] );
 

+ 2 - 2
packages/ckeditor5-ui/tests/creator-utils.js

@@ -9,7 +9,7 @@
 
 import { createEditableUI, createEditorUI } from '/ckeditor5/ui/creator-utils.js';
 import ObservableMixin from '/ckeditor5/utils/observablemixin.js';
-import utils from '/ckeditor5/utils/utils.js';
+import mix from '/ckeditor5/utils/mix.js';
 import Editor from '/ckeditor5/editor.js';
 import Controller from '/ckeditor5/ui/controller.js';
 import View from '/ckeditor5/ui/view.js';
@@ -26,7 +26,7 @@ describe( 'creator-utils', () => {
 		let editable;
 
 		class Editable {}
-		utils.mix( Editable, ObservableMixin );
+		mix( Editable, ObservableMixin );
 
 		class TestController extends Controller {
 			constructor( editor, editable ) {