1 files changed, 73 insertions, 61 deletions
diff --git a/src/Doc.js b/src/Doc.js
index e496996..4b89deb 100644
--- a/src/Doc.js
+++ b/src/Doc.js
@@ -1,75 +1,87 @@
-import Container from './Container.js'
-import Parent from './Parent.js'
-import {adopt, extend} from './tools.js'
-import {ns, xlink, xmlns, svgjs} from './namespaces.js'
+import Base from './Base.js'
+import Defs from './Defs.js'
+import { extend, nodeOrNew } from './tools.js'
+import { ns, xlink, xmlns, svgjs } from './namespaces.js'
+import {adopt} from './adopter.js'
+import * as EventTarget from './EventTarget.js'
+import * as Element from './Element.js'
+import * as Parent from './Parent.js'
 
-export default class Doc extends Container {
-   constructor (node) {
-     super(nodeOrNew('svg', node))
-     this.namespace()
-   }
+export default class Doc extends Base {
+  constructor(node) {
+    super(nodeOrNew('svg', node), Doc)
+    this.namespace()
+  }
+
+  isRoot() {
+    return !this.node.parentNode
+      || !(this.node.parentNode instanceof window.SVGElement)
+      || this.node.parentNode.nodeName === '#document'
+  }
 
-   isRoot () {
-     return !this.node.parentNode || !(this.node.parentNode instanceof window.SVGElement) || this.node.parentNode.nodeName === '#document'
-   }
+  // Check if this is a root svg
+  // If not, call docs from this element
+  doc() {
+    if (this.isRoot()) return this
+    return Element.doc.call(this)
+  }
 
-   // Check if this is a root svg
-   // If not, call docs from this element
-   doc () {
-     if (this.isRoot()) return this
-     return super.doc()
-   }
+  // Add namespaces
+  namespace() {
+    if (!this.isRoot()) return this.doc().namespace()
+    return this
+      .attr({ xmlns: ns, version: '1.1' })
+      .attr('xmlns:xlink', xlink, xmlns)
+      .attr('xmlns:svgjs', svgjs, xmlns)
+  }
 
-   // Add namespaces
-   namespace () {
-     if (!this.isRoot()) return this.doc().namespace()
-     return this
-       .attr({ xmlns: ns, version: '1.1' })
-       .attr('xmlns:xlink', xlink, xmlns)
-       .attr('xmlns:svgjs', svgjs, xmlns)
-   }
+  // Creates and returns defs element
+  defs() {
+    if (!this.isRoot()) return this.doc().defs()
 
-   // Creates and returns defs element
-   defs () {
-     if (!this.isRoot()) return this.doc().defs()
-     return adopt(this.node.getElementsByTagName('defs')[0]) ||
+    if (!this.isRoot()) return this.doc().defs()
+    return adopt(this.node.getElementsByTagName('defs')[0]) ||
       this.put(new Defs())
-   }
+  }
 
-   // custom parent method
-   parent (type) {
-     if (this.isRoot()) {
-       return this.node.parentNode.nodeName === '#document' ? null : this.node.parentNode
-     }
+  // custom parent method
+  parent(type) {
+    if (this.isRoot()) {
+      return this.node.parentNode.nodeName === '#document'
+        ? null
+        : this.node.parentNode
+    }
 
-     return super.parent(type)
-   }
+    return Element.parent.call(this, type)
+  }
 
-   // Removes the doc from the DOM
-   remove () {
-     if (!this.isRoot()) {
-       return super.remove()
-     }
+  // Removes the doc from the DOM
+  remove() {
+    if (!this.isRoot()) {
+      return Element.remove.call(this)
+    }
 
-     if (this.parent()) {
-       this.parent().removeChild(this.node)
-     }
+    if (this.parent()) {
+      this.parent().removeChild(this.node)
+    }
 
-     return this
-   }
+    return this
+  }
 
-   clear () {
-     // remove children
-     while (this.node.hasChildNodes()) {
-       this.node.removeChild(this.node.lastChild)
-     }
-     return this
-   }
+  clear() {
+    // remove children
+    while (this.node.hasChildNodes()) {
+      this.node.removeChild(this.node.lastChild)
+    }
+    return this
+  }
 }
 
-addFactory(Container, {
-  // Create nested svg document
-  nested () {
-    return this.put(new Doc())
-  }
-})
+extend(Doc, [EventTarget, Element, Parent])
+
+// addFactory(Container, {
+//   // Create nested svg document
+//   nested() {
+//     return this.put(new Doc())
+//   }
+// })