register dependencies

cefeboru · Apr 24, 2018 · a307ad1 · a307ad1
1 parent 608fd58
commit a307ad1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/formats/code.js b/formats/code.js
@@ -5,12 +5,21 @@ import Cursor from '../blots/cursor';
 import Inline from '../blots/inline';
 import TextBlot from '../blots/text';
 import Container from '../blots/container';
+import Quill from '../core/quill';
 
-class Code extends Inline {}
-Code.blotName = 'code';
-Code.tagName = 'CODE';
+class CodeBlockContainer extends Container {
+  static create(value) {
+    const domNode = super.create(value);
+    domNode.setAttribute('spellcheck', false);
+    return domNode;
+  }
+}
 
 class CodeBlock extends Block {
+  static register() {
+    Quill.register(CodeBlockContainer);
+  }
+
   delta() {
     if (this.cache.delta == null) {
       this.cache.delta = new Delta()
@@ -20,17 +29,14 @@ class CodeBlock extends Block {
     return this.cache.delta;
   }
 }
+
+class Code extends Inline {}
+Code.blotName = 'code';
+Code.tagName = 'CODE';
+
 CodeBlock.blotName = 'code-block';
 CodeBlock.className = 'ql-code-block';
 CodeBlock.tagName = 'DIV';
-
-class CodeBlockContainer extends Container {
-  static create(value) {
-    const domNode = super.create(value);
-    domNode.setAttribute('spellcheck', false);
-    return domNode;
-  }
-}
 CodeBlockContainer.blotName = 'code-block-container';
 CodeBlockContainer.className = 'ql-code-block-container';
 CodeBlockContainer.tagName = 'DIV';

diff --git a/formats/list.js b/formats/list.js
@@ -1,5 +1,10 @@
 import Block from '../blots/block';
 import Container from '../blots/container';
+import Quill from '../core/quill';
+
+class ListContainer extends Container {}
+ListContainer.blotName = 'list-container';
+ListContainer.tagName = 'OL';
 
 class ListItem extends Block {
   static create(value) {
@@ -12,6 +17,10 @@ class ListItem extends Block {
     return domNode.getAttribute('data-list') || undefined;
   }
 
+  static register() {
+    Quill.register(ListContainer);
+  }
+
   constructor(domNode) {
     super(domNode);
     const listEventHandler = e => {
@@ -38,10 +47,6 @@ class ListItem extends Block {
 ListItem.blotName = 'list';
 ListItem.tagName = 'LI';
 
-class ListContainer extends Container {}
-ListContainer.blotName = 'list-container';
-ListContainer.tagName = 'OL';
-
 ListContainer.allowedChildren = [ListItem];
 ListItem.requiredContainer = ListContainer;
 

diff --git a/modules/syntax.js b/modules/syntax.js
@@ -19,6 +19,8 @@ class SyntaxCodeBlock extends CodeBlock {
     return domNode.getAttribute('data-language') || 'plain';
   }
 
+  static register() {} // Syntax module will register
+
   format(name, value) {
     if (name !== this.statics.blotName) return;
     if (value) {

diff --git a/quill.js b/quill.js
@@ -10,13 +10,13 @@ import Indent from './formats/indent';
 
 import Blockquote from './formats/blockquote';
 import Header from './formats/header';
-import List, { ListContainer } from './formats/list';
 import {
   TableContainer,
   TableBody,
   TableRow,
   TableCell,
 } from './formats/table';
+import List from './formats/list';
 
 import { BackgroundClass, BackgroundStyle } from './formats/background';
 import { ColorClass, ColorStyle } from './formats/color';
@@ -34,10 +34,7 @@ import Formula from './formats/formula';
 import Image from './formats/image';
 import Video from './formats/video';
 
-import CodeBlock, {
-  CodeBlockContainer,
-  Code as InlineCode,
-} from './formats/code';
+import CodeBlock, { Code as InlineCode } from './formats/code';
 
 import Syntax from './modules/syntax';
 import Toolbar from './modules/toolbar';
@@ -74,8 +71,6 @@ Quill.register(
 
 Quill.register(
   {
-    'blots/code-block-container': CodeBlockContainer,
-    'blots/list-container': ListContainer,
     'blots/table-container': TableContainer,
     'blots/table-body': TableBody,
     'blots/table-row': TableRow,