Piotrek Koszuliński 9 роки тому
батько
коміт
0f772812ca

+ 2 - 2
packages/ckeditor5-engine/src/editable/editable.js

@@ -7,8 +7,8 @@
 
 import Controller from '../ui/controller.js';
 import Model from '../ui/model.js';
-import utils from '../utils.js';
-import ObservableMixin from '../observablemixin.js';
+import utils from '../../utils/utils.js';
+import ObservableMixin from '../../utils/observablemixin.js';
 
 /**
  * @memberOf core.editable

+ 1 - 1
packages/ckeditor5-engine/src/editorui/editorui.js

@@ -9,7 +9,7 @@ import Controller from '../ui/controller.js';
 import ControllerCollection from '../ui/controllercollection.js';
 import ComponentFactory from '../ui/componentfactory.js';
 import ObservableMixin from '../observablemixin.js';
-import utils from '../utils.js';
+import utils from '../../utils/utils.js';
 
 /**
  * Base class for the editor main view controllers.

+ 2 - 2
packages/ckeditor5-engine/src/plugin.js

@@ -5,8 +5,8 @@
 
 'use strict';
 
-import ObservableMixin from './observablemixin.js';
-import utils from './utils.js';
+import ObservableMixin from '../utils/observablemixin.js';
+import utils from '../utils/utils.js';
 
 /**
  * The base class for CKEditor plugin classes.

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/delta/basic-transformations.js

@@ -21,7 +21,7 @@ import WeakInsertDelta from './weakinsertdelta.js';
 import WrapDelta from './wrapdelta.js';
 import UnwrapDelta from './unwrapdelta.js';
 
-import utils from '../../utils.js';
+import utils from '../../../utils/utils.js';
 
 // Provide transformations for default deltas.
 

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/delta/transform.js

@@ -6,7 +6,7 @@
 'use strict';
 
 import operationTransform from '../operation/transform.js';
-import arrayUtils from '../../lib/lodash/array.js';
+import arrayUtils from '../../../utils/lib/lodash/array.js';
 
 const specialCases = new Map();
 

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/element.js

@@ -7,7 +7,7 @@
 
 import Node from './node.js';
 import NodeList from './nodelist.js';
-import utils from '../utils.js';
+import utils from '../../utils/utils.js';
 
 /**
  * Tree data model element.

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

@@ -7,8 +7,8 @@
 
 import Position from './position.js';
 import Range from './range.js';
-import EmitterMixin from '../emittermixin.js';
-import utils from '../utils.js';
+import EmitterMixin from '../../utils/emittermixin.js';
+import utils from '../../utils/utils.js';
 
 /**
  * LivePosition is a position in the Tree Model that updates itself as the tree changes. It may be used as a bookmark.

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

@@ -7,8 +7,8 @@
 
 import Range from './range.js';
 import LivePosition from './liveposition.js';
-import EmitterMixin from '../emittermixin.js';
-import utils from '../utils.js';
+import EmitterMixin from '../../utils/emittermixin.js';
+import utils from '../../utils/utils.js';
 
 /**
  * LiveRange is a Range in the Tree Model that updates itself as the tree changes. It may be used as a bookmark.

+ 2 - 2
packages/ckeditor5-engine/src/treemodel/operation/transform.js

@@ -11,8 +11,8 @@ import MoveOperation from './moveoperation.js';
 import RemoveOperation from './removeoperation.js';
 import NoOperation from './nooperation.js';
 import Range from '../range.js';
-import isEqual from '../../lib/lodash/isEqual.js';
-import utils from '../../utils.js';
+import isEqual from '../../../utils/lib/lodash/isEqual.js';
+import utils from '../../../utils/utils.js';
 
 /**
  * Transforms given {@link core.treeModel.operation.Operation operation} by another {@link core.treeModel.operation.Operation operation} and

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/range.js

@@ -7,7 +7,7 @@
 
 import Position from './position.js';
 import TreeWalker from './treewalker.js';
-import utils from '../utils.js';
+import utils from '../../utils/utils.js';
 
 /**
  * Range class. Range is iterable.

+ 1 - 1
packages/ckeditor5-engine/src/treemodel/text.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import utils from '../utils.js';
+import utils from '../../utils/utils.js';
 
 /**
  * Data structure for text with attributes. Note that `Text` is not a {@link core.treeModel.Node}. This class is used

+ 2 - 2
packages/ckeditor5-engine/src/treeview/element.js

@@ -6,8 +6,8 @@
 'use strict';
 
 import Node from './node.js';
-import utils from '../utils.js';
-import isPlainObject from '../lib/lodash/isPlainObject.js';
+import utils from '../../utils/utils.js';
+import isPlainObject from '../../utils/lib/lodash/isPlainObject.js';
 
 /**
  * Tree view element.

+ 2 - 2
packages/ckeditor5-engine/src/treeview/treeview.js

@@ -5,11 +5,11 @@
 
 'use strict';
 
-import EmitterMixin from '../emittermixin.js';
+import EmitterMixin from '../../utils/emittermixin.js';
 import Renderer from './renderer.js';
 import Converter from './converter.js';
 
-import utils from '../utils.js';
+import utils from '../../utils/utils.js';
 
 /**
  * TreeView class combines the actual tree of view elements, tree of DOM elements, {@link core.treeView.Converter converter},

+ 4 - 4
packages/ckeditor5-engine/src/ui/domemittermixin.js

@@ -5,10 +5,10 @@
 
 'use strict';
 
-import EmitterMixin from '../emittermixin.js';
-import utils from '../utils.js';
-import extend from '../lib/lodash/extend.js';
-import log from '../log.js';
+import EmitterMixin from '../../utils/emittermixin.js';
+import utils from '../../utils/utils.js';
+import extend from '../../utils/lib/lodash/extend.js';
+import log from '../../utils/log.js';
 
 /**
  * Creates a ProxyEmitter instance. Such an instance is a bridge between a DOM Node firing events

+ 3 - 3
packages/ckeditor5-engine/src/ui/model.js

@@ -5,9 +5,9 @@
 
 'use strict';
 
-import extend from '../lib/lodash/extend.js';
-import utils from '../utils.js';
-import ObservableMixin from '../observablemixin.js';
+import extend from '../../utils/lib/lodash/extend.js';
+import utils from '../../utils/utils.js';
+import ObservableMixin from '../../utils/observablemixin.js';
 
 /**
  * The base MVC model class.

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

@@ -9,9 +9,9 @@ import Collection from '../../utils/collection.js';
 import Region from './region.js';
 import Template from './template.js';
 import CKEditorError from '../../utils/ckeditorerror.js';
-import DOMEmitterMixin from './domemittermixin.js';
+import DOMEmitterMixin from './../utils/domemittermixin.js';
 import utils from '../../utils/utils.js';
-import isPlainObject from '../lib/lodash/isPlainObject.js';
+import isPlainObject from '../../utils/lib/lodash/isPlainObject.js';
 
 const bindToSymbol = Symbol( 'bindTo' );
 const bindIfSymbol = Symbol( 'bindIf' );

+ 1 - 1
packages/ckeditor5-engine/tests/treemodel/characterproxy.js

@@ -10,7 +10,7 @@
 import Node from '/ckeditor5/core/treemodel/node.js';
 import Element from '/ckeditor5/core/treemodel/element.js';
 import Text from '/ckeditor5/core/treemodel/text.js';
-import utils from '/ckeditor5/core/utils.js';
+import utils from '/ckeditor5/utils/utils.js';
 
 describe( 'CharacterProxy', () => {
 	let text, element, char;