highmark-markdown 1.0.7 → 1.0.10

package/src/example/view/div/preview.js

@@ -3,22 +3,10 @@
 import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
-import { arrayUtilities } from "necessary";
 
 import PageButtonsDiv from "../div/pageButtons";
 
-const { first } = arrayUtilities;
-
 class PreviewDiv extends Element {
-  getPageButtonsDivDOMElement() {
-    const childElements = this.getChildElements(),
-          firstChildElement = first(childElements),
-          pageButtonsDiv = firstChildElement, ///
-          pageButtonsDivDOMElement = pageButtonsDiv.getDOMElement();
-
-    return pageButtonsDivDOMElement;
-  }
-
   getParentDOMElement() {
     const domElement = this.getDOMElement(),
           parentDOMElement = domElement;  ///
@@ -26,33 +14,51 @@ class PreviewDiv extends Element {
     return parentDOMElement;
   }
 
-  getDOMElements() {
+  clear() {
+    let markdownNode;
+
+    markdownNode = this.getMarkdownNode();
+
+    if (markdownNode !== null) {
+      const parentDOMElement = this.getParentDOMElement();
+
+      markdownNode.unmount(parentDOMElement);
+
+      markdownNode = null;
+
+      this.setMarkdownNode(markdownNode);
+    }
+  }
+
+  update(markdownNode, context) {
+    this.clear();
+
     const parentDOMElement = this.getParentDOMElement(),
-          { childNodes } = parentDOMElement,
-          domElements = [ ///
-            ...childNodes
-          ];
+          siblingDOMElement = null;
+
+    markdownNode.mount(parentDOMElement, siblingDOMElement, context);
 
-    return domElements;
+    this.setMarkdownNode(markdownNode);
   }
 
-  clear() {
-    const domElements = this.getDOMElements(),
-          pageButtonsDivDOMElement = this.getPageButtonsDivDOMElement();
+  getMarkdownNode() {
+    const { markdownNode } = this.getState();
 
-    domElements.forEach((domElement) => {
-      if (domElement !== pageButtonsDivDOMElement) {
-        domElement.remove();
-      }
-    });
+    return markdownNode;
   }
 
-  update(domElement) {
-    this.clear();
+  setMarkdownNode(markdownNode) {
+    this.updateState({
+      markdownNode
+    });
+  }
 
-    const parentDOMElement = this.getParentDOMElement();
+  setInitialState() {
+    const markdownNode = null;
 
-    parentDOMElement.appendChild(domElement);
+    this.setState({
+      markdownNode
+    });
   }
 
   childElements() {
@@ -78,6 +84,10 @@ class PreviewDiv extends Element {
     });
   }
 
+  initialise() {
+    this.setInitialState();
+  }
+
   static tagName = "div";
 
   static ignoredProperties = [

package/src/example/view.js

@@ -98,23 +98,25 @@ class View extends Element {
               charactersPerLine
             },
             // markdownNodes = postprocess(divisionMarkdownNode, context),
-            markdownNOde = divisionMarkdownNode,  ///
-            markdownNodes = [
-              markdownNOde
-            ],
-            divisionMarkdownNodes = divisionMarkdownNodesFromMarkdownNodes(markdownNodes);
+            // divisionMarkdownNodes = divisionMarkdownNodesFromMarkdownNodes(markdownNodes);
+            divisionMarkdownNodes = [
+              divisionMarkdownNode
+            ];
 
       this.setDivisionMarkdownNodes(divisionMarkdownNodes);
 
-      const index = 0,
-            length = divisionMarkdownNodes.length,
-            parseTree = divisionMarkdownNode.asParseTree(tokens);
+      const parseTree = divisionMarkdownNode.asParseTree(tokens);
 
-      this.updatePage(index);
+      this.updateMarkdownParseTreeTextarea(parseTree);
 
-      this.updatePageButtonsDiv(length);
+      const index = 0,
+            length = divisionMarkdownNodes.length;
 
-      this.updateMarkdownParseTreeTextarea(parseTree);
+      if (length > 0) {
+        this.updatePage(index);
+
+        this.updatePageButtonsDiv(length);
+      }
     } else {
       this.clearPage();
 
@@ -136,12 +138,11 @@ class View extends Element {
             tokens
           },
           length = null,
-          html = divisionMarkdownNode.asHTML(context),
-          domElement = divisionMarkdownNode.createDOMElement(context);
+          html = divisionMarkdownNode.asHTML(context);
 
     this.updateXMP(html);
 
-    this.updatePreviewDiv(domElement);
+    this.updatePreviewDiv(divisionMarkdownNode, context);
 
     this.updatePageButtonsDiv(length, index);
   }

package/src/mixins/element.js

@@ -1,21 +1,5 @@
 "use strict";
 
-import {EMPTY_STRING} from "../constants";
-
-function addDOMElement(domElement) {
-  const parentDOMElement = this.domElement; ///
-
-  parentDOMElement.appendChild(domElement);
-}
-
-function removeDOMElements() {
-  const innerHTML = EMPTY_STRING; ///
-
-  Object.assign(this.domElement, {
-    innerHTML
-  });
-}
-
 function getDescendantElements(descendantElements = []) {
   const domElement = this.getDOMElement();
 
@@ -41,8 +25,6 @@ function getDescendantElements(descendantElements = []) {
 }
 
 const elementMixins = {
-  addDOMElement,
-  removeDOMElements,
   getDescendantElements
 };
 

package/src/node/markdown/anchor.js

@@ -36,6 +36,25 @@ export default class AnchorMarkdownNode extends MarkdownNode {
     return attributeValue;
   }
 
+  createDOMElement(context) {
+    let domElement;
+
+    const content = this.content(context),
+          textNode = document.createTextNode(content);
+
+    domElement = super.createDOMElement(context)
+
+    const parentDOMElement = domElement;  ///
+
+    domElement = textNode; ///
+
+    parentDOMElement.appendChild(domElement);
+
+    domElement = parentDOMElement;  ///
+
+    return domElement;
+  }
+
   asHTML(indent, context) {
     if (context === undefined) {
       context = indent; ///
@@ -58,18 +77,16 @@ ${childNodesHTML}${indent}${closingTag}
   }
 
   childNodesAsHTML(indent, context) {
-    const content = EMPTY_STRING,
+    const content = this.content(context),
           childNodesHTML = content; ///
 
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(context) {
-    const content = EMPTY_STRING,
-          textNode = document.createTextNode(content),
-          domElement = textNode; ///
+  content(context) {
+    const content = EMPTY_STRING;
 
-    this.addDOMElement(domElement);
+    return content;
   }
 
   clone() { return super.clone(this.prepend, this.identifier); }

package/src/node/markdown/blockLine.js

@@ -31,31 +31,48 @@ export default class BlockLineMarkdownNode extends MarkdownNode {
     return childNodesHTML;
   }
 
-  asHTML(indent, context) {
-    const childNodesHTML = this.childNodesAsHTML(indent, context),
-          startingTag = this.startingTag(context),
-          closingTag = this.closingTag(context),
-          html = `${startingTag}${childNodesHTML}${closingTag}`;
+  mount(parentDOMElement, siblingDOMElement, context) {
+    this.domElement = this.createDOMElement(context);
 
-    return html;
+    if (siblingDOMElement !== null) {
+      siblingDOMElement = siblingDOMElement.nextSibling;  ///
+    }
+
+    parentDOMElement.insertBefore(this.domElement, siblingDOMElement);
+
+    siblingDOMElement = this.domElement;  ///
+
+    return siblingDOMElement;
   }
 
   createDOMElement(context) {
-    const tagName = this.tagName(context),
-          className = this.className(context),
-          domElement = document.createElement(tagName);
+    let domElement;
 
-    Object.assign(domElement, {
-      className
-    });
+    const content = this.content(context),
+          textNode = document.createTextNode(content);
 
-    this.setDOMElement(domElement);
+    domElement = super.createDOMElement(context)
 
-    this.createChildNodeDOMElements(context);
+    const parentDOMElement = domElement;  ///
+
+    domElement = textNode; ///
+
+    parentDOMElement.appendChild(domElement);
+
+    domElement = parentDOMElement;  ///
 
     return domElement;
   }
 
+  asHTML(indent, context) {
+    const childNodesHTML = this.childNodesAsHTML(indent, context),
+          startingTag = this.startingTag(context),
+          closingTag = this.closingTag(context),
+          html = `${startingTag}${childNodesHTML}${closingTag}`;
+
+    return html;
+  }
+
   childNodesAsHTML(indent, context) {
     const content = this.content(context),
           childNodesHTML = content; ///
@@ -70,20 +87,6 @@ export default class BlockLineMarkdownNode extends MarkdownNode {
     return plainText;
   }
 
-  createChildNodeDOMElements(context) {
-    let domElement;
-
-    domElement = this.getDOMElement();
-
-    const content = this.content(context),
-          textNode = document.createTextNode(content),
-          parentDOMElement = domElement;  ///
-
-    domElement = textNode; ///
-
-    parentDOMElement.appendChild(domElement);
-  }
-
   static lines = 2;
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(BlockLineMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/comma.js

@@ -5,23 +5,21 @@ import MarkdownNode from "../../node/markdown";
 import { COMMA } from "../../constants";
 
 export default class CommaMarkdownNode extends MarkdownNode {
-  asHTML(indent, context) {
-    const content = this.content(context),
-          html = content; ///
-
-    return html;
-  }
-
   createDOMElement(context) {
     const content = this.content(context),
           textNode = document.createTextNode(content),
           domElement = textNode;  ///
 
-    this.setDOMElement(domElement);
-
     return domElement;
   }
 
+  asHTML(indent, context) {
+    const content = this.content(context),
+          html = content; ///
+
+    return html;
+  }
+
   content(context) {
     const content = COMMA; ///
 

package/src/node/markdown/directive/pageNumber.js

@@ -36,17 +36,20 @@ export default class PageNumberDirectiveMarkdownNode extends DirectiveMarkdownNo
   }
 
   createDOMElement(context) {
-    const tagName = this.tagName(context),
-          className = this.className(context),
-          domElement = document.createElement(tagName);
+    let domElement;
 
-    Object.assign(domElement, {
-      className
-    });
+    const content = this.content(context),
+          textNode = document.createTextNode(content);
+
+    domElement = super.createDOMElement(context);
+
+    const parentDOMElement = domElement;  ///
+
+    domElement = textNode; ///
 
-    this.setDOMElement(domElement);
+    parentDOMElement.appendChild(domElement);
 
-    this.createChildNodeDOMElements(context);
+    domElement = parentDOMElement;
 
     return domElement;
   }
@@ -58,14 +61,6 @@ export default class PageNumberDirectiveMarkdownNode extends DirectiveMarkdownNo
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(context) {
-    const content = this.content(context),
-          textNode = document.createTextNode(content),
-          domElement = textNode; ///
-
-    this.addDOMElement(domElement);
-  }
-
   clone() { return super.clone(this.number); }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) {

package/src/node/markdown/directives.js

@@ -7,34 +7,20 @@ import MarkdownNode from "../../node/markdown";
 const { first } = arrayUtilities;
 
 export default class DirectivesMarkdownNode extends MarkdownNode {
-  getDOMElement() {
-    const directiveMarkdownNode = this.getDirectiveMarkdownNode(),
-          directiveMarkdownNodeDOMElement = directiveMarkdownNode.getDOMElement(),
-          domElement = directiveMarkdownNodeDOMElement; ///
-
-    return domElement;
-  }
-
   asHTML(indent, context) {
-    const directiveMarkdownNode = this.getDirectiveMarkdownNode(),
-          directiveMarkdownNodeHTML = directiveMarkdownNode.asHTML(indent, context),
-          html = directiveMarkdownNodeHTML;  ///
+    const firstDirectiveMarkdownNode = this.getFirstDirectiveMarkdownNode(),
+          firstDirectiveMarkdownNodeHTML = firstDirectiveMarkdownNode.asHTML(indent, context),
+          html = firstDirectiveMarkdownNodeHTML;  ///
 
     return html;
   }
 
-  createDOMElement(context) {
-    const directiveMarkdownNode = this.getDirectiveMarkdownNode();
-
-    directiveMarkdownNode.createDOMElement(context);
-  }
-
-  getDirectiveMarkdownNode() {
+  getFirstDirectiveMarkdownNode() {
     const childNodes = this.getChildNodes(),
           firstChildNode = first(childNodes),
-          directiveMarkdownNode = firstChildNode; ///
+          firstDirectiveMarkdownNode = firstChildNode; ///
 
-    return directiveMarkdownNode;
+    return firstDirectiveMarkdownNode;
   }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(DirectivesMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/emailLink.js

@@ -63,37 +63,62 @@ class EmailLinkMarkdownNode extends MarkdownNode {
     return attributeValue;
   }
 
-  childNodesAsHTML(indent, context) {
-    let childNodesHTML;
+  mount(parentDOMElement, siblingDOMElement, context) {
+    this.domElement = this.createDOMElement(context);
+
+    if (siblingDOMElement !== null) {
+      siblingDOMElement = siblingDOMElement.nextSibling;  ///
+    }
+
+    parentDOMElement.insertBefore(this.domElement, siblingDOMElement);
+
+    siblingDOMElement = this.domElement;  ///
+
+    return siblingDOMElement;
+  }
+
+  createDOMElement(context) {
+    let content;
 
     const inlineText = this.inlineText(context);
 
     if (inlineText !== null) {
-      childNodesHTML = inlineText;  ///
+      content = inlineText; ///
     } else {
-      const content = this.content(context);
-
-      childNodesHTML = content; ///
+      content = this.content(context);
     }
 
-    return childNodesHTML;
-  }
+    let domElement;
 
-  createChildNodeDOMElements(context) {
-    const inlineText = this.inlineText(context);
+    const textNode = document.createTextNode(content);
+
+    domElement = super.createDOMElement(context);
+
+    const parentDOMElement = domElement;  ///
+
+    domElement = textNode; ///
 
+    parentDOMElement.appendChild(domElement);
+
+    domElement = parentDOMElement;  ///
+
+    return domElement;
+  }
+
+  childNodesAsHTML(indent, context) {
     let content;
 
+    const inlineText = this.inlineText(context);
+
     if (inlineText !== null) {
-      content = inlineText; ///
+      content = inlineText;  ///
     } else {
       content = this.content(context);
     }
 
-    const textNode = document.createTextNode(content),
-          domElement = textNode; ///
+    const childNodesHTML = content;
 
-    this.addDOMElement(domElement);
+    return childNodesHTML;
   }
 
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmailLinkMarkdownNode, ruleName, childNodes, opacity); }

package/src/node/markdown/emphasisedText.js

@@ -1,12 +1,48 @@
 "use strict";
 
+import { arrayUtilities } from "necessary";
+
 import MarkdownNode from "../../node/markdown";
 import contentMixins from "../../mixins/content";
 
+const { second } = arrayUtilities;
+
 class EmphasisedTextMarkdownNode extends MarkdownNode {
+  inlineText(context) {
+    const indent = null,
+          childNodes = this.getChildNodes(),
+          secondChildNode = second(childNodes),
+          inlineTextMarkdownNode = secondChildNode, ///
+          inlineTextMarkdownNodeHTML = inlineTextMarkdownNode.asHTML(indent, context),
+          inlineText = inlineTextMarkdownNodeHTML;  ///
+
+    return inlineText;
+  }
+
+  createDOMElement(context) {
+    const inlineText = this.inlineText(context),
+          content = inlineText; ///
+
+    let domElement;
+
+    const textNode = document.createTextNode(content);
+
+    domElement = super.createDOMElement(context);
+
+    const parentDOMElement = domElement;  ///
+
+    domElement = textNode; ///
+
+    parentDOMElement.appendChild(domElement);
+
+    domElement = parentDOMElement;  ///
+
+    return domElement;
+  }
+
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmphasisedTextMarkdownNode, ruleName, childNodes, opacity); }
 }
 
 Object.assign(EmphasisedTextMarkdownNode.prototype, contentMixins);
 
-export default EmphasisedTextMarkdownNode;
+export default EmphasisedTextMarkdownNode;

package/src/node/markdown/emptyTableCell.js

@@ -3,15 +3,17 @@
 import MarkdownNode from "../../node/markdown";
 
 export default class EmptyTableCellMarkdownNode extends MarkdownNode {
+  createDOMElement(context) {
+    const domElement = null;
+
+    return domElement;
+  }
+
   childNodesAsHTML(indent, context) {
     const childNodesHTML = null;
 
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(domElement, context) {
-    ///
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(EmptyTableCellMarkdownNode, ruleName, childNodes, opacity); }
 }

package/src/node/markdown/endOfLine.js

@@ -23,8 +23,6 @@ export default class EndOfLineMarkdownNode extends MarkdownNode {
           textNode = document.createTextNode(content),
           domElement = textNode;  ///
 
-    this.setDOMElement(domElement);
-
     return domElement;
   }
 

package/src/node/markdown/error.js

@@ -17,17 +17,20 @@ class ErrorMarkdownNode extends MarkdownNode {
   }
 
   createDOMElement(context) {
-    const tagName = this.tagName(context),
-          className = this.className(context),
-          domElement = document.createElement(tagName);
+    let domElement;
 
-    Object.assign(domElement, {
-      className
-    });
+    const content = this.content(context),
+          textNode  = document.createTextNode(content);
+
+    domElement = super.createDOMElement(context);
+
+    const parentDOMElement = domElement;
+
+    domElement = textNode; ///
 
-    this.setDOMElement(domElement);
+    parentDOMElement.appendChild(domElement);
 
-    this.createChildNodeDOMElements(context);
+    domElement = parentDOMElement;  ///
 
     return domElement;
   }
@@ -39,14 +42,6 @@ class ErrorMarkdownNode extends MarkdownNode {
     return childNodesHTML;
   }
 
-  createChildNodeDOMElements(context) {
-    const content = this.content(context),
-          textNode  = document.createTextNode(content),
-          domElement = textNode; ///
-
-    this.addDOMElement(domElement);
-  }
-
   static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return MarkdownNode.fromRuleNameChildNodesAndOpacity(ErrorMarkdownNode, ruleName, childNodes, opacity); }
 }
 

package/src/node/markdown/footnoteLink.js

@@ -56,19 +56,30 @@ export default class FootnoteLinkMarkdownNode extends MarkdownNode {
     return attributeValue;
   }
 
-  childNodesAsHTML(indent, context) {
+  createDOMElement(context) {
+    let domElement;
+
     const content = this.content(context),
-          childNodesHTML = content; ///
+          textNode  = document.createTextNode(content);
 
-    return childNodesHTML;
+    domElement = super.createDOMElement(context);
+
+    const parentDOMElement = domElement;
+
+    domElement = textNode; ///
+
+    parentDOMElement.appendChild(domElement);
+
+    domElement = parentDOMElement;  ///
+
+    return domElement;
   }
 
-  createChildNodeDOMElements(context) {
+  childNodesAsHTML(indent, context) {
     const content = this.content(context),
-          textNode = document.createTextNode(content),
-          domElement = textNode; ///
+          childNodesHTML = content; ///
 
-    this.addDOMElement(domElement);
+    return childNodesHTML;
   }
 
   clone() { return super.clone(this.number); }