Revert "Attempted node renderer"

This reverts commit d98563d.
anstosa · Mar 12, 2018 · e0b0ef8 · e0b0ef8
1 parent d98563d
commit e0b0ef8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 68 deletions.
diff --git a/build.sh b/build.sh
@@ -6,4 +6,3 @@ cp node_modules/markdown-it/dist/markdown-it.min.js files/
 cp node_modules/markdown-it-task-checkbox/index.js files/markdown-it-checkbox.min.js
 cp node_modules/highlightjs/highlight.pack.min.js files/
 cp node_modules/highlightjs/styles/github.css files/
-cp node_modules/htmlparser/lib/htmlparser.min.js files/
diff --git a/files/htmlparser.min.js b/files/htmlparser.min.js
diff --git a/files/node-htmlparser.min.js b/files/node-htmlparser.min.js
diff --git a/files/tiddlywiki.files b/files/tiddlywiki.files
@@ -31,14 +31,6 @@
                 "title": "$:/plugins/anstosa/tw5-markdown/markdown-checkbox.js",
                 "module-type": "library"
             }
-        },
-        {
-            "file": "htmlparser.min.js",
-            "fields": {
-                "type": "application/javascript",
-                "title": "$:/plugins/anstosa/tw5-markdown/htmlparser.js",
-                "module-type": "library"
-            }
         }
     ]
 }
diff --git a/package.json b/package.json
@@ -1,13 +1,12 @@
 {
   "name": "tw5-markdown",
-  "version": "1.1.1",
+  "version": "1.1.4",
   "private": true,
   "scripts": {
     "build": "./build.sh"
   },
   "dependencies": {
     "highlightjs": "^9.10.0",
-    "htmlparser": "^1.7.7",
     "markdown-it": "^8.4.0",
     "markdown-it-task-checkbox": "^1.0.4"
   }

diff --git a/plugin.info b/plugin.info
@@ -2,7 +2,7 @@
     "title": "$:/plugins/anstosa/tw5-markdown",
     "description": "Markdown",
     "author": "Ansel Santosa",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "core-version": ">=5.0.0",
     "source": "https://github.com/anstosa/tw5-markdown",
     "plugin-type": "plugin",

diff --git a/wrapper.js b/wrapper.js
@@ -10,8 +10,11 @@ Wraps up the markdown-it parser for use in TiddlyWiki5
 
     const TYPE_WIKI = 'text/vnd.tiddlywiki';
 
+    let dom;
+    if (typeof(window) !== 'undefined') {
+        dom = new DOMParser();
+    }
     const highlight = require('$:/plugins/anstosa/tw5-markdown/highlight.js');
-    const htmlparser = require('$:/plugins/anstosa/tw5-markdown/htmlparser.js');
     const MarkdownIt = require('$:/plugins/anstosa/tw5-markdown/markdown.js');
     const markdown = new MarkdownIt({
         highlight: (source, syntax) => {
@@ -34,10 +37,10 @@ Wraps up the markdown-it parser for use in TiddlyWiki5
     });
 
     const tiddlify = (node, forceText) => {
-        if (node.type === 'text') {
+        if (node.nodeType === Node.TEXT_NODE) {
             let subtree;
             try {
-                const children = new $tw.Wiki.parsers[TYPE_WIKI](TYPE_WIKI, node.data, {}).tree[0].children;
+                const children = new $tw.Wiki.parsers[TYPE_WIKI](TYPE_WIKI, node.textContent, {}).tree[0].children;
                 if (children.length === 0) {
                     subtree = null;
                 }
@@ -60,32 +63,25 @@ Wraps up the markdown-it parser for use in TiddlyWiki5
             }
             else {
                 return {
-                    text: node.data,
+                    text: node.textContent,
                     type: 'text'
                 };
             }
         }
-        if (node.name) {
+        if (node.tagName) {
             const widget = {
                 attributes: {},
-                tag: node.name,
+                tag: node.tagName.toLowerCase(),
                 type: 'element'
             };
-            $tw.utils.each(node.attribs, (value, attribute) => {
-                widget.attributes[attribute] = {
+            $tw.utils.each(node.attributes, (attribute) => {
+                widget.attributes[attribute.nodeName] = {
                     type: 'string',
-                    value: value,
+                    value: attribute.nodeValue
                 };
             });
-            if (widget.tag === 'a') {
-                widget.attributes.class = widget.attributes.class || {
-                    type: 'string',
-                    value: '',
-                };
-                widget.attributes.class.value += ' tc-tiddlylink';
-            }
             widget.children = [];
-            node.children.forEach((child) => {
+            node.childNodes.forEach((child) => {
                 const isPlainText = (
                     forceText ||
                     widget.tag === 'code' ||
@@ -100,17 +96,8 @@ Wraps up the markdown-it parser for use in TiddlyWiki5
     class MarkdownParser {
         constructor(type, text, options) {
             const source = markdown.render(text);
-            const handler = new Tautologistics.NodeHtmlParser.DefaultHandler((error, dom) => {
-                if (error) { console.error(error); }
-            }, {verbose: true});
-            const parser = new Tautologistics.NodeHtmlParser.Parser(handler);
-            parser.parseComplete(source);
-            this.tree = tiddlify({
-                children: handler.dom,
-                name: 'body',
-                type: 'tag',
-            }).children;
-            console.log(this.tree);
+            const tree = dom.parseFromString(source, 'text/html');
+            this.tree = tiddlify(tree.body).children;
         }
     }