8
0
Piotrek Koszuliński 10 лет назад
Родитель
Сommit
c50f8519c8

+ 1 - 2
packages/ckeditor5-engine/src/collection.js

@@ -7,7 +7,6 @@
 
 import EmitterMixin from './emittermixin.js';
 import CKEditorError from './ckeditorerror.js';
-import utilsObject from './lib/lodash/object.js';
 import utils from './utils.js';
 
 /**
@@ -266,7 +265,7 @@ export default class Collection {
 	}
 }
 
-utilsObject.extend( Collection.prototype, EmitterMixin );
+utils.mix( Collection, EmitterMixin );
 
 /**
  * Fired when an item is added to the collection.

+ 2 - 1
packages/ckeditor5-engine/src/model.js

@@ -9,6 +9,7 @@ import EmitterMixin from './emittermixin.js';
 import CKEditorError from './ckeditorerror.js';
 import utilsObject from './lib/lodash/object.js';
 import utilsLang from './lib/lodash/lang.js';
+import utils from './utils.js';
 
 /**
  * The base MVC model class.
@@ -625,7 +626,7 @@ function attachBindToListeners( model, toBindings ) {
 	} );
 }
 
-utilsObject.extend( Model.prototype, EmitterMixin );
+utils.mix( Model, EmitterMixin );
 
 /**
  * Fired when an attribute changed value.

+ 2 - 2
packages/ckeditor5-engine/src/treemodel/document.js

@@ -10,7 +10,7 @@ import Batch from './batch.js';
 import Selection from './selection.js';
 import EmitterMixin from '../emittermixin.js';
 import CKEditorError from '../ckeditorerror.js';
-import objectUtils from '../lib/lodash/object.js';
+import utils from '../utils.js';
 
 const graveyardSymbol = Symbol( 'graveyard' );
 
@@ -229,4 +229,4 @@ export default class Document {
 	 */
 }
 
-objectUtils.extend( Document.prototype, EmitterMixin );
+utils.mix( Document, EmitterMixin );

+ 2 - 2
packages/ckeditor5-engine/src/treemodel/liveposition.js

@@ -8,7 +8,7 @@
 import Position from './position.js';
 import Range from './range.js';
 import EmitterMixin from '../emittermixin.js';
-import objectUtils from '../lib/lodash/object.js';
+import utils from '../utils.js';
 
 /**
  * Enum representing how position is "sticking" with their neighbour nodes.
@@ -167,4 +167,4 @@ function transform( type, range, position ) {
 	this.root = transformed.root;
 }
 
-objectUtils.extend( LivePosition.prototype, EmitterMixin );
+utils.mix( LivePosition, EmitterMixin );

+ 2 - 2
packages/ckeditor5-engine/src/treemodel/liverange.js

@@ -8,7 +8,7 @@
 import Range from './range.js';
 import LivePosition from './liveposition.js';
 import EmitterMixin from '../emittermixin.js';
-import objectUtils from '../lib/lodash/object.js';
+import utils from '../utils.js';
 
 /**
  * LiveRange is a Range in the Tree Model that updates itself as the tree changes. It may be used as a bookmark.
@@ -134,4 +134,4 @@ function fixBoundaries( type, range, position ) {
 	}
 }
 
-objectUtils.extend( LiveRange.prototype, EmitterMixin );
+utils.mix( LiveRange, EmitterMixin );

+ 2 - 2
packages/ckeditor5-engine/src/treemodel/selection.js

@@ -9,7 +9,7 @@ import LiveRange from './liverange.js';
 import AttributeList from './attributelist.js';
 import EmitterMixin from '../emittermixin.js';
 import CKEditorError from '../ckeditorerror.js';
-import objectUtils from '../lib/lodash/object.js';
+import utils from '../utils.js';
 
 /**
  * Represents a selection that is made on nodes in {@link treeModel.Document}. Selection instance is
@@ -199,4 +199,4 @@ function pushRange( range ) {
 	this._ranges.push( LiveRange.createFromRange( range ) );
 }
 
-objectUtils.extend( Selection.prototype, EmitterMixin );
+utils.mix( Selection, EmitterMixin );

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

@@ -11,7 +11,7 @@ import Region from './region.js';
 import Template from './template.js';
 import CKEditorError from '../ckeditorerror.js';
 import DOMEmitterMixin from './domemittermixin.js';
-import objectUtils from '../lib/lodash/object.js';
+import utils from '../utils.js';
 
 /**
  * Basic View class.
@@ -386,7 +386,7 @@ export default class View extends Model {
 	}
 }
 
-objectUtils.extend( View.prototype, DOMEmitterMixin );
+utils.mix( View, DOMEmitterMixin );
 
 const validSelectorTypes = new Set( [ 'string', 'boolean', 'function' ] );