include core/ in import path

closes slab#623

_develop/webpack.config.js

@@ -25,14 +25,14 @@ module.exports = {
   resolve: {
     alias: {
       'parchment'     : path.resolve(__dirname, '..', 'node_modules/parchment/src/parchment'),
-      'quill/core'    : path.resolve(__dirname, '..', 'core.js'),
+      'quill/core$'   : path.resolve(__dirname, '..', 'core.js'),
+      'quill/core'    : path.resolve(__dirname, '..', 'core'),
       'quill/assets'  : path.resolve(__dirname, '..', 'assets'),
       'quill/blots'   : path.resolve(__dirname, '..', 'blots'),
       'quill/formats' : path.resolve(__dirname, '..', 'formats'),
       'quill/modules' : path.resolve(__dirname, '..', 'modules'),
       'quill/themes'  : path.resolve(__dirname, '..', 'themes'),
-      'quill/ui'      : path.resolve(__dirname, '..', 'ui'),
-      'quill'         : path.resolve(__dirname, '..', 'core')
+      'quill/ui'      : path.resolve(__dirname, '..', 'ui')
     },
     extensions: ['', '.js', '.styl', '.ts']
   },

blots/scroll.js

@@ -1,5 +1,5 @@
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
+import Emitter from 'quill/core/emitter';
 import BreakBlot from 'quill/blots/break';
 import Block, { EmbedBlock } from 'quill/blots/block';
 import CursorBlot from 'quill/blots/cursor';

core.js

@@ -1,4 +1,4 @@
-import Quill from 'quill/quill';
+import Quill from 'quill/core/quill';
 import Parchment from 'parchment';
 
 import Block from 'quill/blots/block';

core/editor.js

@@ -1,8 +1,8 @@
 import Delta from 'rich-text/lib/delta';
 import DeltaOp from 'rich-text/lib/op';
-import Emitter from './emitter';
+import Emitter from 'quill/core/emitter';
 import Parchment from 'parchment';
-import Block, { bubbleFormats } from '../blots/block';
+import Block, { bubbleFormats } from 'quill/blots/block';
 import clone from 'clone';
 import extend from 'extend';
 

core/emitter.js

@@ -1,5 +1,5 @@
 import EventEmitter from 'eventemitter3';
-import logger from './logger';
+import logger from 'quill/core/logger';
 
 let debug = logger('quill:events');
 

core/quill.js

@@ -1,13 +1,13 @@
-import './polyfill';
+import 'quill/core/polyfill';
 import Delta from 'rich-text/lib/delta';
-import Editor from './editor';
-import Emitter from './emitter';
-import Module from './module';
+import Editor from 'quill/core/editor';
+import Emitter from 'quill/core/emitter';
+import Module from 'quill/core/module';
 import Parchment from 'parchment';
-import Selection, { Range } from './selection';
+import Selection, { Range } from 'quill/core/selection';
 import extend from 'extend';
-import logger from './logger';
-import Theme from './theme';
+import logger from 'quill/core/logger';
+import Theme from 'quill/core/theme';
 
 let debug = logger('[quill]');
 

core/selection.js

@@ -1,11 +1,11 @@
 import Parchment from 'parchment';
-import Emitter from './emitter';
 import equal from 'deep-equal';
-import logger from './logger';
-
+import Emitter from 'quill/core/emitter';
+import logger from 'quill/core/logger';
 
 let debug = logger('[quill:selection]');
 
+
 class Range {
   constructor(index, length = 0) {
     this.index = index;

core/theme.js

@@ -1,6 +1,6 @@
-import Emitter from './emitter';
 import extend from 'extend';
-import logger from './logger';
+import Emitter from 'quill/core/emitter';
+import logger from 'quill/core/logger';
 
 let debug = logger('[quill:theme]');
 

modules/clipboard.js

@@ -1,8 +1,8 @@
 import Delta from 'rich-text/lib/delta';
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
-import logger from 'quill/logger';
-import Module from 'quill/module';
+import Quill from 'quill/core';
+import logger from 'quill/core/logger';
+import Module from 'quill/core/module';
 
 let debug = logger('quill:clipboard');
 
@@ -85,8 +85,8 @@ class Clipboard extends Module {
     if (e.defaultPrevented) return;
     this.onCopy(e);
     let range = this.quill.getSelection();
-    this.quill.deleteText(range, Emitter.sources.USER);
-    this.quill.setSelection(range.index, Emitter.sources.SILENT);
+    this.quill.deleteText(range, Quill.sources.USER);
+    this.quill.setSelection(range.index, Quill.sources.SILENT);
   }
 
   onPaste(e) {
@@ -95,9 +95,9 @@ class Clipboard extends Module {
     let clipboard = e.clipboardData || window.clipboardData;
     let delta = new Delta().retain(range.index).delete(range.length);
     let done = (delta) => {
-      this.quill.updateContents(delta, Emitter.sources.USER);
+      this.quill.updateContents(delta, Quill.sources.USER);
       // range.length contributes to delta.length()
-      this.quill.setSelection(delta.length() - range.length, Emitter.sources.SILENT);
+      this.quill.setSelection(delta.length() - range.length, Quill.sources.SILENT);
       this.quill.selection.scrollIntoView();
     };
     let intercept = (delta, callback) => {

modules/code-highlighter.js

@@ -1,6 +1,6 @@
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
-import Module from 'quill/module';
+import Quill from 'quill/core';
+import Module from 'quill/core/module';
 import CodeBlock from 'quill/formats/code';
 
 
@@ -28,7 +28,7 @@ class CodeHighlighter extends Module {
   constructor(quill, options) {
     super(quill, options);
     let timer = null;
-    this.quill.on(Emitter.events.SCROLL_OPTIMIZE, () => {
+    this.quill.on(Quill.events.SCROLL_OPTIMIZE, () => {
       if (timer != null) return;
       timer = setTimeout(() => {
         this.highlight();
@@ -44,7 +44,7 @@ class CodeHighlighter extends Module {
       code.highlight();
     });
     if (range != null) {
-      this.quill.setSelection(range, Emitter.sources.SILENT);
+      this.quill.setSelection(range, Quill.sources.SILENT);
     }
   }
 }

modules/image-tooltip.js

@@ -1,5 +1,5 @@
-import Emitter from 'quill/emitter';
-import Module from 'quill/module';
+import Quill from 'quill/core';
+import Module from 'quill/core/module';
 import ImageBlot from 'quill/formats/image';
 import { bindKeys } from 'quill/modules/keyboard';
 
@@ -39,8 +39,8 @@ class ImageTooltip extends Module {
   save() {
     let range = this.quill.getSelection(true);
     let index = range.index + range.length;
-    this.quill.insertEmbed(index, ImageBlot.blotName, this.textbox.value, Emitter.sources.USER);
-    this.quill.setSelection(index + 1, Emitter.sources.SILENT);
+    this.quill.insertEmbed(index, ImageBlot.blotName, this.textbox.value, Quill.sources.USER);
+    this.quill.setSelection(index + 1, Quill.sources.SILENT);
     this.hide();
   }
 

modules/keyboard.js

@@ -2,10 +2,10 @@ import clone from 'clone';
 import equal from 'deep-equal';
 import Delta from 'rich-text/lib/delta';
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
-import logger from 'quill/logger';
-import Module from 'quill/module';
-import { Range } from 'quill/selection';
+import Quill from 'quill/core';
+import logger from 'quill/core/logger';
+import Module from 'quill/core/module';
+import { Range } from 'quill/core/selection';
 import Block from 'quill/blots/block';
 
 let debug = logger('quill:keyboard');
@@ -53,24 +53,24 @@ class Keyboard extends Module {
 
   onDelete(backspace, range) {
     if (range.length > 0) {
-      this.quill.deleteText(range, Emitter.sources.USER);
+      this.quill.deleteText(range, Quill.sources.USER);
     } else if (!backspace) {
-      this.quill.deleteText(range.index, 1, Emitter.sources.USER);
+      this.quill.deleteText(range.index, 1, Quill.sources.USER);
     } else {
       let [line, offset] = this.quill.scroll.descendant(Block, range.index);
       let formats = this.quill.getFormat(range);
       if (line != null && offset === 0 && (formats['indent'] || formats['list'])) {
         if (formats['indent'] != null) {
-          line.format('indent', parseInt(formats['indent']) - 1, Emitter.sources.USER);
+          line.format('indent', parseInt(formats['indent']) - 1, Quill.sources.USER);
         } else {
           line.format('list', false);
         }
       } else {
-        this.quill.deleteText(range.index - 1, 1, Emitter.sources.USER);
+        this.quill.deleteText(range.index - 1, 1, Quill.sources.USER);
         range = new Range(Math.max(0, range.index - 1));
       }
     }
-    this.quill.setSelection(range.index, Emitter.sources.SILENT);
+    this.quill.setSelection(range.index, Quill.sources.SILENT);
   }
 
   onEnter(range) {
@@ -97,8 +97,8 @@ class Keyboard extends Module {
     } else {
       delta.delete(range.length);
     }
-    this.quill.updateContents(delta, Emitter.sources.USER);
-    this.quill.setSelection(range.index + added, Emitter.sources.SILENT);
+    this.quill.updateContents(delta, Quill.sources.USER);
+    this.quill.setSelection(range.index + added, Quill.sources.SILENT);
     Object.keys(formats).forEach((name) => {
       if (lineFormats[name] == null) {
         this.quill.format(name, formats[name]);
@@ -108,23 +108,23 @@ class Keyboard extends Module {
 
   onFormat(format, range) {
     let formats = this.quill.getFormat(range);
-    this.quill.format(format, !formats[format], Emitter.sources.USER);
+    this.quill.format(format, !formats[format], Quill.sources.USER);
   }
 
   onTab(range, evt) {
     if (range.length === 0) {
       let delta = new Delta().retain(range.index).insert('\t').delete(range.length);
-      this.quill.updateContents(delta, Emitter.sources.USER);
-      this.quill.setSelection(range.index + 1, Emitter.sources.SILENT);
+      this.quill.updateContents(delta, Quill.sources.USER);
+      this.quill.setSelection(range.index + 1, Quill.sources.SILENT);
     } else {
       let modifier = evt.shiftKey ? -1 : 1;
       this.quill.scroll.descendants(Block, range.index, range.length).forEach(function(line) {
         let format = line.formats();
         let indent = parseInt(format['indent'] || 0);
         line.format('indent', Math.max(0, indent + modifier));
       });
-      this.quill.update(Emitter.sources.USER);
-      this.quill.setSelection(range, Emitter.sources.SILENT);
+      this.quill.update(Quill.sources.USER);
+      this.quill.setSelection(range, Quill.sources.SILENT);
     }
   }
 

modules/link-tooltip.js

@@ -1,6 +1,6 @@
-import Emitter from 'quill/emitter';
-import Module from 'quill/module';
-import { Range } from 'quill/selection';
+import Quill from 'quill/core';
+import Module from 'quill/core/module';
+import { Range } from 'quill/core/selection';
 import LinkBlot from 'quill/formats/link';
 import { bindKeys } from 'quill/modules/keyboard';
 
@@ -27,7 +27,7 @@ class LinkTooltip extends Module {
     });
     this.container.querySelector('a.ql-remove').addEventListener('click', this.remove.bind(this));
     // quill.keyboard.addBinding({ key: 'K', metaKey: true }, this.show.bind(this));
-    quill.on(Emitter.events.SELECTION_CHANGE, (range) => {
+    quill.on(Quill.events.SELECTION_CHANGE, (range) => {
       if (range != null && range.length === 0) {
         let offset;
         [this.link, offset] = this.quill.scroll.descendant(LinkBlot, range.index);
@@ -63,15 +63,15 @@ class LinkTooltip extends Module {
   }
 
   remove() {
-    this.quill.formatText(this.range, 'link', false, Emitter.sources.USER);
-    this.quill.setSelection(this.range, Emitter.sources.SILENT);
+    this.quill.formatText(this.range, 'link', false, Quill.sources.USER);
+    this.quill.setSelection(this.range, Quill.sources.SILENT);
     this.hide();
   }
 
   save() {
     let url = this.textbox.value;
-    this.quill.formatText(this.range, 'link', url, Emitter.sources.USER);
-    this.quill.setSelection(this.range, Emitter.sources.SILENT);
+    this.quill.formatText(this.range, 'link', url, Quill.sources.USER);
+    this.quill.setSelection(this.range, Quill.sources.SILENT);
     this.hide();
   }
 

modules/toolbar.js

@@ -1,7 +1,7 @@
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
-import logger from 'quill/logger';
-import Module from 'quill/module';
+import Quill from 'quill/core';
+import logger from 'quill/core/logger';
+import Module from 'quill/core/module';
 
 let debug = logger('quill:toolbar');
 
@@ -32,8 +32,8 @@ class Toolbar extends Module {
     [].forEach.call(this.container.querySelectorAll('a, button, input[type=button], select'), (input) => {
       this.attach(input);
     });
-    this.quill.on(Emitter.events.SELECTION_CHANGE, this.update, this)
-              .on(Emitter.events.SCROLL_CHANGE, this.update, this);
+    this.quill.on(Quill.events.SELECTION_CHANGE, this.update, this)
+              .on(Quill.events.SCROLL_CHANGE, this.update, this);
   }
 
   attach(input) {
@@ -54,7 +54,7 @@ class Toolbar extends Module {
       if (this.handlers[format]) {
         if (this.handlers[format](value)) return;
       }
-      this.quill.format(format, value, Emitter.sources.USER);
+      this.quill.format(format, value, Quill.sources.USER);
     });
     // TODO use weakmap
     this.controls.push([format, input]);

modules/undo-manager.js

@@ -1,5 +1,5 @@
-import Emitter from 'quill/emitter';
-import Module from 'quill/module';
+import Quill from 'quill/core';
+import Module from 'quill/core/module';
 
 
 class UndoManager extends Module {
@@ -8,9 +8,9 @@ class UndoManager extends Module {
     this.lastRecorded = 0;
     this.ignoreChange = false;
     this.clear();
-    this.quill.on(Emitter.events.TEXT_CHANGE, (delta, oldDelta, source) => {
+    this.quill.on(Quill.events.TEXT_CHANGE, (delta, oldDelta, source) => {
       if (this.ignoreChange) return;
-      if (!this.options.userOnly || source === Emitter.sources.USER) {
+      if (!this.options.userOnly || source === Quill.sources.USER) {
         this.record(delta, oldDelta);
       } else {
         this.transform(delta);
@@ -25,7 +25,7 @@ class UndoManager extends Module {
     let delta = this.stack[source].pop();
     this.lastRecorded = 0;
     this.ignoreChange = true;
-    this.quill.updateContents(delta[source], Emitter.sources.USER);
+    this.quill.updateContents(delta[source], Quill.sources.USER);
     this.ignoreChange = false;
     let index = getLastChangeIndex(delta[source]);
     this.quill.setSelection(index);

test/helpers/unit.js

@@ -1,9 +1,9 @@
 import Delta from 'rich-text/lib/delta';
-import Editor from 'quill/editor';
-import Emitter from 'quill/emitter';
-import Selection from 'quill/selection';
+import Editor from 'quill/core/editor';
+import Emitter from 'quill/core/emitter';
+import Selection from 'quill/core/selection';
 import Scroll from 'quill/blots/scroll';
-import Quill from 'quill/quill';
+import Quill from 'quill/core';
 import equal from 'deep-equal';
 
 

test/unit/blots/scroll.js

@@ -1,5 +1,5 @@
 import Parchment from 'parchment';
-import Emitter from 'quill/emitter';
+import Emitter from 'quill/core/emitter';
 import Scroll from 'quill/blots/scroll';
 
 

test/unit/core/editor.js

@@ -1,7 +1,7 @@
 import Delta from 'rich-text/lib/delta';
-import Editor from 'quill/editor';
-import Emitter from 'quill/emitter';
-import Selection, { Range } from 'quill/selection';
+import Editor from 'quill/core/editor';
+import Emitter from 'quill/core/emitter';
+import Selection, { Range } from 'quill/core/selection';
 
 
 describe('Editor', function() {