Merge pull request #107 from ckeditor/t/106

Moved DomEmitterMixin to utils.
ckeditor · Nov 10, 2016 · 7d4c0fc · 7d4c0fc
2 parents 9e86c00 + 07af815
commit 7d4c0fc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 773 deletions.
diff --git a/src/domemittermixin.js b/src/domemittermixin.js
diff --git a/src/template.js b/src/template.js
@@ -852,8 +852,8 @@ function getStyleUpdater( el, styleName ) {
 function clone( def ) {
 	const clone = cloneDeepWith( def, value => {
 		// Don't clone the `Template.bind`* bindings because of the references to Observable
-		// and DOMEmitterMixin instances inside, which would also be traversed and cloned by greedy
-		// cloneDeepWith algorithm. There's no point in cloning Observable/DOMEmitterMixins
+		// and DomEmitterMixin instances inside, which would also be traversed and cloned by greedy
+		// cloneDeepWith algorithm. There's no point in cloning Observable/DomEmitterMixins
 		// along with the definition.
 		//
 		// Also don't clone View instances if provided as a child of the Template. The template

diff --git a/src/view.js b/src/view.js
@@ -6,7 +6,7 @@
 import CKEditorError from '../utils/ckeditorerror.js';
 import ViewCollection from './viewcollection.js';
 import Template from './template.js';
-import DOMEmitterMixin from './domemittermixin.js';
+import DomEmmiterMixin from '../utils/dom/emittermixin.js';
 import ObservableMixin from '../utils/observablemixin.js';
 import Collection from '../utils/collection.js';
 import mix from '../utils/mix.js';
@@ -44,8 +44,8 @@ import mix from '../utils/mix.js';
  *		} );
  *
  * @memberOf ui
- * @mixes DOMEmitterMixin
- * @mixes ObservableMixin
+ * @mixes utils.dom.EmmiterMixin
+ * @mixes utils.ObservableMixin
  */
 export default class View {
 	/**
@@ -298,5 +298,5 @@ export default class View {
 	}
 }
 
-mix( View, DOMEmitterMixin );
+mix( View, DomEmmiterMixin );
 mix( View, ObservableMixin );