Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into t/ckeditor5-media-embed/1
Browse files Browse the repository at this point in the history
  • Loading branch information
oleq committed Aug 9, 2018
2 parents af56cfd + f7f2837 commit 4007bf6
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 18 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"framework"
],
"dependencies": {
"@ckeditor/ckeditor5-utils": "^10.2.0"
"@ckeditor/ckeditor5-utils": "^10.2.0",
"lodash-es": "^4.17.10"
},
"devDependencies": {
"@ckeditor/ckeditor5-basic-styles": "^10.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/conversion/downcast-converters.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ViewAttributeElement from '../view/attributeelement';
import ViewRange from '../view/range';
import DocumentSelection from '../model/documentselection';

import cloneDeep from '@ckeditor/ckeditor5-utils/src/lib/lodash/cloneDeep';
import { cloneDeep } from 'lodash-es';

/**
* Contains downcast (model-to-view) converters for {@link module:engine/conversion/downcastdispatcher~DowncastDispatcher}.
Expand Down
2 changes: 1 addition & 1 deletion src/conversion/downcastdispatcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Consumable from './modelconsumable';
import Range from '../model/range';
import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
import mix from '@ckeditor/ckeditor5-utils/src/mix';
import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
import { extend } from 'lodash-es';

/**
* `DowncastDispatcher` is a central point of downcasting (conversion from model to view), which is a process of reacting to changes
Expand Down
2 changes: 1 addition & 1 deletion src/conversion/upcast-converters.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Matcher from '../view/matcher';
import ModelRange from '../model/range';
import ModelPosition from '../model/position';

import cloneDeep from '@ckeditor/ckeditor5-utils/src/lib/lodash/cloneDeep';
import { cloneDeep } from 'lodash-es';

/**
* Contains {@link module:engine/view/view view} to {@link module:engine/model/model model} converters for
Expand Down
2 changes: 1 addition & 1 deletion src/conversion/viewconsumable.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @module engine/conversion/viewconsumable
*/

import isArray from '@ckeditor/ckeditor5-utils/src/lib/lodash/isArray';
import { isArray } from 'lodash-es';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/dev-utils/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
} from '../conversion/downcast-selection-converters';
import { insertText, insertElement, wrap, insertUIElement } from '../conversion/downcast-converters';

import isPlainObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isPlainObject';
import { isPlainObject } from 'lodash-es';
import toMap from '@ckeditor/ckeditor5-utils/src/tomap';

/**
Expand Down
2 changes: 1 addition & 1 deletion src/model/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import RootElement from './rootelement';
import History from './history';
import DocumentSelection from './documentselection';
import Collection from '@ckeditor/ckeditor5-utils/src/collection';
import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import mix from '@ckeditor/ckeditor5-utils/src/mix';
import { isInsideSurrogatePair, isInsideCombinedSymbol } from '@ckeditor/ckeditor5-utils/src/unicode';
import { clone } from 'lodash-es';

const graveyardName = '$graveyard';

Expand Down
2 changes: 1 addition & 1 deletion src/model/operation/attributeoperation.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Operation from './operation';
import Range from '../range';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import { _setAttribute } from './utils';
import isEqual from '@ckeditor/ckeditor5-utils/src/lib/lodash/isEqual';
import { isEqual } from 'lodash-es';

/**
* Operation to change nodes' attribute.
Expand Down
2 changes: 1 addition & 1 deletion src/model/operation/operation.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @module engine/model/operation/operation
*/

import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
import { clone } from 'lodash-es';

/**
* Abstract base operation class.
Expand Down
2 changes: 1 addition & 1 deletion src/model/position.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
*/

import TreeWalker from './treewalker';
import last from '@ckeditor/ckeditor5-utils/src/lib/lodash/last';
import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import Text from './text';
import { last } from 'lodash-es';

/**
* Represents a position in the model tree.
Expand Down
2 changes: 1 addition & 1 deletion src/view/domconverter.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import indexOf from '@ckeditor/ckeditor5-utils/src/dom/indexof';
import getAncestors from '@ckeditor/ckeditor5-utils/src/dom/getancestors';
import getCommonAncestor from '@ckeditor/ckeditor5-utils/src/dom/getcommonancestor';
import isText from '@ckeditor/ckeditor5-utils/src/dom/istext';
import isElement from '@ckeditor/ckeditor5-utils/src/lib/lodash/isElement';
import { isElement } from 'lodash-es';

/**
* DomConverter is a set of tools to do transformations between DOM nodes and view nodes. It also handles
Expand Down
2 changes: 1 addition & 1 deletion src/view/element.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import Text from './text';
import TextProxy from './textproxy';
import objectToMap from '@ckeditor/ckeditor5-utils/src/objecttomap';
import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
import isPlainObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isPlainObject';
import Matcher from './matcher';
import { isPlainObject } from 'lodash-es';

/**
* View element.
Expand Down
2 changes: 1 addition & 1 deletion src/view/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import EmitterMixin from '@ckeditor/ckeditor5-utils/src/emittermixin';
import mix from '@ckeditor/ckeditor5-utils/src/mix';
import clone from '@ckeditor/ckeditor5-utils/src/lib/lodash/clone';
import compareArrays from '@ckeditor/ckeditor5-utils/src/comparearrays';
import { clone } from 'lodash-es';

/**
* Abstract tree view node class.
Expand Down
2 changes: 1 addition & 1 deletion src/view/observer/domeventdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @module engine/view/observer/domeventdata
*/

import extend from '@ckeditor/ckeditor5-utils/src/lib/lodash/extend';
import { extend } from 'lodash-es';

/**
* Information about a DOM event in context of the {@link module:engine/view/document~Document}.
Expand Down
2 changes: 1 addition & 1 deletion src/view/observer/fakeselectionobserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import Observer from './observer';
import ViewSelection from '../selection';
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
import debounce from '@ckeditor/ckeditor5-utils/src/lib/lodash/debounce';
import { debounce } from 'lodash-es';

/**
* Fake selection observer class. If view selection is fake it is placed in dummy DOM container. This observer listens
Expand Down
2 changes: 1 addition & 1 deletion src/view/observer/mutationobserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import Observer from './observer';
import ViewSelection from '../selection';
import { startsWithFiller, getDataWithoutFiller } from '../filler';
import isEqualWith from '@ckeditor/ckeditor5-utils/src/lib/lodash/isEqualWith';
import { isEqualWith } from 'lodash-es';

/**
* Mutation observer class observes changes in the DOM, fires {@link module:engine/view/document~Document#event:mutations} event, mark view
Expand Down
2 changes: 1 addition & 1 deletion src/view/observer/selectionobserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import Observer from './observer';
import MutationObserver from './mutationobserver';
import log from '@ckeditor/ckeditor5-utils/src/log';
import debounce from '@ckeditor/ckeditor5-utils/src/lib/lodash/debounce';
import { debounce } from 'lodash-es';

/**
* Selection observer class observes selection changes in the document. If selection changes on the document this
Expand Down
2 changes: 1 addition & 1 deletion src/view/writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import Range from './range';
import CKEditorError from '@ckeditor/ckeditor5-utils/src/ckeditorerror';
import DocumentFragment from './documentfragment';
import isIterable from '@ckeditor/ckeditor5-utils/src/isiterable';
import isPlainObject from '@ckeditor/ckeditor5-utils/src/lib/lodash/isPlainObject';
import Text from './text';
import EditableElement from './editableelement';
import { isPlainObject } from 'lodash-es';

/**
* View writer class. Provides set of methods used to properly manipulate nodes attached to
Expand Down

0 comments on commit 4007bf6

Please sign in to comment.