importing content-kit-utils from npm

package.json

@@ -41,5 +41,8 @@
     "gulp-uglify": "^1.1.0",
     "gulp-util": "~2.2.12",
     "qunitjs": "^1.15.0"
+  },
+  "devDependencies": {
+    "content-kit-utils": "git://github.com/bustlelabs/content-kit-utils#master"
   }
 }

src/js/content-kit-compiler/compiler.js

@@ -1,7 +1,7 @@
 import HTMLParser from './parsers/html-parser';
 import HTMLRenderer from './renderers/html-renderer';
 import { DefaultBlockTypeSet, DefaultMarkupTypeSet } from './types/default-types';
-import { mergeWithOptions } from '../content-kit-utils/object-utils';
+import { mergeWithOptions } from 'node_modules/content-kit-utils/src/object-utils';
 
 /**
  * @class Compiler

src/js/content-kit-compiler/models/block.js

@@ -1,5 +1,5 @@
 import Model from './model';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 
 /**
  * Ensures block markups at the same index are always in a specific order.

src/js/content-kit-compiler/models/markup.js

@@ -1,5 +1,5 @@
 import Model from './model';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 
 /**
  * @class MarkupModel

src/js/content-kit-compiler/parsers/html-parser.js

@@ -2,10 +2,10 @@ import BlockModel from '../models/block';
 import MarkupModel from '../models/markup';
 import Type from '../types/type';
 import { DefaultBlockTypeSet, DefaultMarkupTypeSet } from '../types/default-types';
-import { mergeWithOptions } from '../../content-kit-utils/object-utils';
-import { toArray } from '../../content-kit-utils/array-utils';
-import { trim, trimLeft, sanitizeWhitespace } from '../../content-kit-utils/string-utils';
-import { DOMParsingNode, textOfNode, unwrapNode, attributesForNode } from '../../content-kit-utils/node-utils';
+import { mergeWithOptions } from 'node_modules/content-kit-utils/src/object-utils';
+import { toArray } from 'node_modules/content-kit-utils/src/array-utils';
+import { trim, trimLeft, sanitizeWhitespace } from 'node_modules/content-kit-utils/src/string-utils';
+import { DOMParsingNode, textOfNode, unwrapNode, attributesForNode } from 'node_modules/content-kit-utils/src/node-utils';
 
 var ELEMENT_NODE = window.Node && Node.ELEMENT_NODE || 1;
 var TEXT_NODE    = window.Node && Node.TEXT_NODE    || 3;

src/js/content-kit-compiler/renderers/html-element-renderer.js

@@ -1,5 +1,5 @@
-import { injectIntoString } from '../../content-kit-utils/string-utils';
-import { sumSparseArray } from '../../content-kit-utils/array-utils';
+import { injectIntoString } from 'node_modules/content-kit-utils/src/string-utils';
+import { sumSparseArray } from 'node_modules/content-kit-utils/src/array-utils';
 
 /**
  * Builds an opening html tag. i.e. '<a href="http://link.com/" rel="author">'

src/js/content-kit-compiler/renderers/html-renderer.js

@@ -2,7 +2,7 @@ import Type from '../types/type';
 import HTMLElementRenderer from './html-element-renderer';
 import HTMLEmbedRenderer from './html-embed-renderer';
 import { DefaultBlockTypeSet, DefaultMarkupTypeSet } from '../types/default-types';
-import { mergeWithOptions } from '../../content-kit-utils/object-utils';
+import { mergeWithOptions } from 'node_modules/content-kit-utils/src/object-utils';
 
 /**
  * @class HTMLRenderer

src/js/content-kit-compiler/types/type.js

@@ -1,4 +1,4 @@
-import { underscore } from '../../content-kit-utils/string-utils';
+import { underscore } from 'node_modules/content-kit-utils/src/string-utils';
 
 /**
  * @class Type

src/js/content-kit-editor/commands/bold.js

@@ -1,6 +1,6 @@
 import TextFormatCommand from './text-format';
 import { getSelectionBlockTagName } from '../utils/selection-utils';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 var RegExpHeadingTag = /^(h1|h2|h3|h4|h5|h6)$/i;

src/js/content-kit-editor/commands/format-block.js

@@ -1,6 +1,6 @@
 import TextFormatCommand from './text-format';
 import { getSelectionBlockElement, selectNode } from '../utils/selection-utils';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function FormatBlockCommand(options) {

src/js/content-kit-editor/commands/heading.js

@@ -1,5 +1,5 @@
 import FormatBlockCommand from './format-block';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function HeadingCommand() {

src/js/content-kit-editor/commands/image.js

@@ -2,7 +2,7 @@ import Command from './base';
 import Message from '../views/message';
 import Type from '../../content-kit-compiler/types/type';
 import BlockModel from '../../content-kit-compiler/models/block';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { FileUploader } from '../utils/http-utils';
 
 function createFileInput(command) {

src/js/content-kit-editor/commands/italic.js

@@ -1,5 +1,5 @@
 import TextFormatCommand from './text-format';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function ItalicCommand() {

src/js/content-kit-editor/commands/link.js

@@ -1,7 +1,7 @@
 import TextFormatCommand from './text-format';
 import Prompt from '../views/prompt';
 import { getSelectionTagName } from '../utils/selection-utils';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 var RegExpHttp = /^https?:\/\//i;

src/js/content-kit-editor/commands/list.js

@@ -1,6 +1,6 @@
 import TextFormatCommand from './text-format';
 import { getSelectionBlockElement, selectNode, getSelectionTagName } from '../utils/selection-utils';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function ListCommand(options) {

src/js/content-kit-editor/commands/oembed.js

@@ -2,7 +2,7 @@ import Command from './base';
 import Prompt from '../views/prompt';
 import Message from '../views/message';
 import EmbedModel from '../../content-kit-compiler/models/embed';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { OEmbedder } from '../utils/http-utils';
 
 function loadTwitterWidgets(element) {

src/js/content-kit-editor/commands/ordered-list.js

@@ -1,5 +1,5 @@
 import ListCommand from './list';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function OrderedListCommand() {

src/js/content-kit-editor/commands/quote.js

@@ -1,5 +1,5 @@
 import FormatBlockCommand from './format-block';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function QuoteCommand() {

src/js/content-kit-editor/commands/subheading.js

@@ -1,5 +1,5 @@
 import FormatBlockCommand from './format-block';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function SubheadingCommand() {

src/js/content-kit-editor/commands/text-format.js

@@ -1,5 +1,5 @@
 import Command from './base';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 
 function TextFormatCommand(options) {
   options = options || {};

src/js/content-kit-editor/commands/unordered-list.js

@@ -1,5 +1,5 @@
 import ListCommand from './list';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import Type from '../../content-kit-compiler/types/type';
 
 function UnorderedListCommand() {

src/js/content-kit-editor/editor/editor-html-renderer.js

@@ -1,6 +1,6 @@
 import HTMLRenderer from '../../content-kit-compiler/renderers/html-renderer';
 import Type from '../../content-kit-compiler/types/type';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 
 function embedRenderer(model) {
   var embedAttrs = model.attributes;

src/js/content-kit-editor/editor/editor.js

@@ -18,8 +18,8 @@ import EventEmitter from '../utils/event-emitter';
 import { cleanPastedContent } from '../utils/paste-utils';
 import Compiler from '../../content-kit-compiler/compiler';
 import Type from '../../content-kit-compiler/types/type';
-import { toArray } from '../../content-kit-utils/array-utils';
-import { merge, mergeWithOptions } from '../../content-kit-utils/object-utils';
+import { toArray } from 'node_modules/content-kit-utils/src/array-utils';
+import { merge, mergeWithOptions } from 'node_modules/content-kit-utils/src/object-utils';
 
 var defaults = {
   placeholder: 'Write here...',

src/js/content-kit-editor/views/embed-intent.js

@@ -1,6 +1,6 @@
 import View from './view';
 import Toolbar from './toolbar';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { getSelectionBlockElement } from '../utils/selection-utils';
 import { elementContentIsEmpty, positionElementToLeftOf, positionElementCenteredIn } from '../utils/element-utils';
 import Keycodes from '../utils/keycodes';

src/js/content-kit-editor/views/message.js

@@ -1,5 +1,5 @@
 import View from './view';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 
 var defaultClassNames = ['ck-message'];
 

src/js/content-kit-editor/views/prompt.js

@@ -1,5 +1,5 @@
 import View from './view';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { restoreRange } from '../utils/selection-utils';
 import { createDiv, positionElementToRect } from '../utils/element-utils';
 import Keycodes from '../utils/keycodes';

src/js/content-kit-editor/views/text-format-toolbar.js

@@ -1,5 +1,5 @@
 import Toolbar from './toolbar';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { selectionIsEditable, selectionIsInElement } from '../utils/selection-utils';
 import Keycodes from '../utils/keycodes';
 

src/js/content-kit-editor/views/toolbar.js

@@ -1,6 +1,6 @@
 import View from './view';
 import ToolbarButton from './toolbar-button';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { tagsInSelection } from '../utils/selection-utils';
 import { createDiv, swapElements, positionElementToRightOf, positionElementCenteredAbove } from '../utils/element-utils';
 

src/js/content-kit-editor/views/tooltip.js

@@ -1,5 +1,5 @@
 import View from './view';
-import { inherit } from '../../content-kit-utils/object-utils';
+import { inherit } from 'node_modules/content-kit-utils/src/object-utils';
 import { positionElementCenteredBelow, getEventTargetMatchingTag } from '../utils/element-utils';
 
 function Tooltip(options) {