From aee07e33e410ba370cf574fe20bd0f99b37eb219 Mon Sep 17 00:00:00 2001
From: Kabir Shah <simplecooldude1@gmail.com>
Date: Thu, 1 Jun 2017 16:08:28 -0700
Subject: [PATCH] make eventListeners dynamic (added if needed), and add
 advanced optimizations :zap:

---
 dist/moon.js            | 46 +++++++++++++++++++++++------------------
 dist/moon.min.js        |  2 +-
 src/instance/methods.js |  7 ++++---
 src/util/dom.js         | 20 +++++++++++-------
 src/util/util.js        |  6 ++++--
 src/util/vdom.js        | 13 +++++-------
 test/js/test.js         |  6 +++---
 7 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/dist/moon.js b/dist/moon.js
index a8463e26..5241cfc7 100644
--- a/dist/moon.js
+++ b/dist/moon.js
@@ -229,12 +229,14 @@
         var child = children[i];
         var childProps = child.props.attrs;
         var slotName = "";
+        var slotValue = null;
     
         if ((slotName = childProps.slot) !== undefined) {
-          if (slots[slotName] === undefined) {
+          slotValue = slots[slotName];
+          if (slotValue === undefined) {
             slots[slotName] = [child];
           } else {
-            slots[slotName].push(child);
+            slotValue.push(child);
           }
           delete childProps.slot;
         } else {
@@ -383,7 +385,10 @@
           }
         }
         // Add all event listeners
-        addEventListeners(el, vnode);
+        var eventListeners = null;
+        if ((eventListeners = vnode.meta.eventListeners) !== undefined) {
+          addEventListeners(el, eventListeners);
+        }
       }
     
       // Setup Props
@@ -406,8 +411,9 @@
       parent.appendChild(node);
     
       // Check for Component
-      if (vnode.meta.component) {
-        createComponentFromVNode(node, vnode, vnode.meta.component);
+      var component = null;
+      if ((component = vnode.meta.component) !== undefined) {
+        createComponentFromVNode(node, vnode, component);
       }
     };
     
@@ -418,9 +424,10 @@
      */
     var removeChild = function (node, parent) {
       // Check for Component
-      if (node.__moon__) {
+      var componentInstance = null;
+      if ((componentInstance = node.__moon__) !== undefined) {
         // Component was unmounted, destroy it here
-        node.__moon__.destroy();
+        componentInstance.destroy();
       }
     
       // Remove the Node
@@ -445,8 +452,9 @@
       parent.replaceChild(newNode, oldNode);
     
       // Check for Component
-      if (vnode.meta.component) {
-        createComponentFromVNode(newNode, vnode, vnode.meta.component);
+      var component = null;
+      if ((component = vnode.meta.component) !== undefined) {
+        createComponentFromVNode(newNode, vnode, component);
       }
     };
     
@@ -563,7 +571,7 @@
       } else if ((component = components[tag]) !== undefined) {
         // Resolve Component
         if (component.options.functional === true) {
-          return createFunctionalComponent(attrs, children, components[tag]);
+          return createFunctionalComponent(attrs, children, component);
         } else {
           meta.component = component;
         }
@@ -620,9 +628,7 @@
      * @param {Object} eventListeners
      * @param {Object} oldVNode
      */
-    var diffEventListeners = function (node, eventListeners, oldVNode) {
-      var oldEventListeners = oldVNode.meta.eventListeners;
-    
+    var diffEventListeners = function (node, eventListeners, oldEventListeners) {
       for (var type in eventListeners) {
         var oldEventListener = oldEventListeners[type];
         if (oldEventListener === undefined) {
@@ -736,7 +742,7 @@
      * @return {Object} adjusted node only if it was replaced
      */
     var hydrate = function (node, vnode, parent) {
-      var nodeName = node ? node.nodeName.toLowerCase() : null;
+      var nodeName = node !== null ? node.nodeName.toLowerCase() : null;
     
       if (node === null) {
         // No node, create one
@@ -819,10 +825,9 @@
      * @param {Object} oldVNode
      * @param {Object} vnode
      * @param {Object} parent
-     * @param {Object} instance
      * @return {Number} patch type
      */
-    var diff = function (oldVNode, vnode, parent, instance) {
+    var diff = function (oldVNode, vnode, parent) {
       if (oldVNode === null) {
         // No Node, append a node
         appendChild(createNodeFromVNode(vnode), vnode, parent);
@@ -875,7 +880,7 @@
         // Diff event listeners
         var eventListeners = null;
         if ((eventListeners = vnode.meta.eventListeners) !== undefined) {
-          diffEventListeners(_node, eventListeners, oldVNode);
+          diffEventListeners(_node, eventListeners, oldVNode.meta.eventListeners);
         }
     
         // Check if innerHTML was changed, don't diff children
@@ -2088,11 +2093,12 @@
         if (vnode.type !== old.type) {
           // Root Element Changed During Diff
           // Replace Root Element
-          replaceChild(old.meta.el, createNodeFromVNode(vnode), parent);
+          var newRoot = createNodeFromVNode(vnode);
+          replaceChild(old.meta.el, newRoot, vnode, parent);
     
           // Update Bound Instance
-          this.$el = vnode.meta.el;
-          this.$el.__moon__ = this;
+          newRoot.__moon__ = this;
+          this.$el = newRoot;
         } else {
           // Diff
           diff(old, vnode, parent);
diff --git a/dist/moon.min.js b/dist/moon.min.js
index ed148eee..e9bc8d18 100644
--- a/dist/moon.min.js
+++ b/dist/moon.min.js
@@ -4,4 +4,4 @@
  * Released under the MIT License
  * http://moonjs.ga
  */
-!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={},this.setters={},this.clear={},this.target=null,this.map={}}function t(t){void 0===t&&(t={}),this.$options=t;var r=this;m(this,"$name",t.name,"root");var n=t.data;this.$data=void 0===n?{}:"function"==typeof n?n():n,m(this,"$render",t.render,$),m(this,"$hooks",t.hooks,{});var i=t.methods;void 0!==i&&a(r,i),this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!0,this.$queued=!1;var o=t.computed;void 0!==o&&s(this,o),this.init()}var r={},n={},i={},o={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},a=function(e,t){for(var r in t)!function(t,r){e.$data[t]=function(){return r.apply(e,arguments)}}(r,t[r])},s=function(e,t){for(var r in t)!function(r){var n=e.$observer;n.observe(r),Object.defineProperty(e.$data,r,{get:function(){var i=null;return void 0===n.cache[r]?(n.target=r,i=t[r].get.call(e),n.target=null,n.cache[r]=i):i=n.cache[r],i},set:$});var i=null;void 0!==(i=t[r].set)&&(n.setters[r]=i)}(r)};e.prototype.observe=function(e){var t=this;this.clear[e]=function(){t.cache[e]=void 0}},e.prototype.notify=function(e,t){var r=null;if(void 0!==(r=this.map[e]))for(var n=0;n<r.length;n++)this.notify(r[n]);var i=null;void 0!==(i=this.clear[e])&&i()};var l=function(e){!1===t.config.silent&&console.log(e)},u=function(e){!1===t.config.silent&&console.error("[Moon] ERR: "+e)},c=function(e){!1===e.$queued&&!1===e.$destroyed&&(e.$queued=!0,setTimeout(function(){e.build(),g(e,"updated"),e.$queued=!1},0))},v=function(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n")},f=function(e,t,r,n){r=r.replace(/\[(\w+)\]/g,".$1");for(var i=r.split("."),o=0;o<i.length-1;o++){t=t[i[o]]}return t[i[o]]=n,i[0]},p=function(e){var t={};if(t.default=[],0===e.length)return t;for(var r=0;r<e.length;r++){var n=e[r],i=n.props.attrs,o="";void 0!==(o=i.slot)?(void 0===t[o]?t[o]=[n]:t[o].push(n),delete i.slot):t.default.push(n)}return t},d=function(e,t){for(var r in t)e[r]=t[r];return e},h=function(e,t){var r={};for(var n in e)r[n]=e[n];for(var n in t)r[n]=t[n];return r},m=function(e,t,r,n){e[t]=void 0===r?n:r},g=function(e,t){var r=e.$hooks[t];void 0!==r&&r.call(e)},y=function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},$=function(){},b=function(e){for(var t={},r=e.attributes,n=r.length;n--;)t[r[n].name]=r[n].value;return t},x=function(e,t){for(var r in t)!function(r){var n=function(e){for(var t=n.handlers,r=0;r<t.length;r++)t[r](e)};n.handlers=t[r],t[r]=n,e.addEventListener(r,n)}(r)},k=function(e){var t=null;if("#text"===e.type)t=document.createTextNode(e.val);else{if(t=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)t.textContent=e.children[0].val,e.children[0].meta.el=t.firstChild;else for(var r=0;r<e.children.length;r++){var n=e.children[r];_(k(n),n,t)}x(t,e)}return D(t,{},e,e.props.attrs),e.meta.el=t,t},_=function(e,t,r){r.appendChild(e),t.meta.component&&T(e,t,t.meta.component)},E=function(e,t){e.__moon__&&e.__moon__.destroy(),t.removeChild(e)},A=function(e,t,r,n){e.__moon__&&e.__moon__.destroy(),n.replaceChild(t,e),r.meta.component&&T(t,r,r.meta.component)},w={SKIP:0,APPEND:1,REMOVE:2,REPLACE:3,TEXT:4,CHILDREN:5},R=function(){return{shouldRender:!1}},C=function(e,t,r){var n=r.meta,i=n.eventListeners;void 0===i&&(i=n.eventListeners={});var o=i[e];void 0===o?i[e]=[t]:o.push(t)},L=function(e,t,r,n,i){return{type:e,val:t,props:r,children:i,meta:n||R()}},O=function(e,t,r){var n=r.options.data||{};if(void 0!==r.options.props)for(var i=r.options.props,o=0;o<i.length;o++){var a=i[o];n[a]=e.attrs[a]}return r.options.render(P,{data:n,slots:p(t)})},P=function(e,t,r,n){var o=null;if("#text"===e)return L("#text",r,{attrs:{}},t,[]);if(void 0!==(o=i[e])){if(!0===o.options.functional)return O(t,n,i[e]);r.component=o}return L(e,"",t,r,n)},T=function(e,t,r){for(var n=new r.CTor,i=n.$props,o=n.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]=a[l]}return n.$slots=p(t.children),n.$el=e,n.build(),g(n,"mounted"),t.meta.el=n.$el,n.$el},S=function(e,t,r){var n=r.meta.eventListeners;for(var i in t){var o=n[i];void 0===o?e.removeEventListener(i,o):n[i].handlers=t[i]}},D=function(e,t,n){var i=n.props.attrs;for(var o in i){var a=i[o],s=t[o];void 0===a&&!1===a&&null===a||void 0!==s&&!1!==s&&null!==s&&a===s||(10===o.length&&"xlink:href"===o?e.setAttributeNS("http://www.w3.org/1999/xlink","href",a):e.setAttribute(o,!0===a?"":a))}for(var l in t){var u=i[l];void 0!==u&&!1!==u&&null!==u||e.removeAttribute(l)}var c=null;if(void 0!==(c=n.props.directives))for(var v in c){var f=null;void 0!==(f=r[v])&&f(e,c[v],n)}var p=null;if(void 0!==(p=n.props.dom))for(var d in p){var h=p[d];e[d]!==h&&(e[d]=h)}},G=function(e,t){if(void 0===e.__moon__)T(e,t,t.meta.component);else{for(var r=e.__moon__,n=!1,i=r.$props,o=r.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]!==a[l]&&(o[l]=a[l],n=!0)}0!==t.children.length&&(r.$slots=p(t.children),n=!0),!0===n&&r.build()}},N=function(e,t,r){var n=e?e.nodeName.toLowerCase():null;if(null===e){var i=k(t);return _(i,t,r),i}if(null===t)return E(e,r),null;if(n!==t.type){var o=k(t);return A(e,o,t,r),o}if("#text"===t.type)return"#text"===n?(e.textContent!==t.val&&(e.textContent=t.val),t.meta.el=e):A(e,k(t),t,r),e;if(t.meta.el=e,void 0!==t.meta.component)return G(e,t),e;D(e,b(e),t);var a=null;void 0!==(a=t.meta.eventListeners)&&x(e,a);var s=t.props.dom;if(void 0!==s&&void 0!==s.innerHTML)return e;for(var l=t.children,u=l.length,c=0,v=e.firstChild,f=0!==u?l[0]:null;null!==f||null!==v;){var p=null!==v?v.nextSibling:null;N(v,f,e),f=++c<u?l[c]:null,v=p}return e},M=function(e,t,r,n){if(null===e)return _(k(t),t,r),w.APPEND;if(null===t)return E(e.meta.el,r),w.REMOVE;if(e===t)return w.SKIP;if(e.type!==t.type)return A(e.meta.el,k(t),t,r),w.REPLACE;if(!0===t.meta.shouldRender&&"#text"===t.type){var i=e.meta.el;return"#text"===e.type?(t.val!==e.val&&(i.textContent=t.val),w.TEXT):(A(i,k(t),t,r),w.REPLACE)}if(!0===t.meta.shouldRender){var o=e.meta.el;if(void 0!==t.meta.component)return G(o,t),w.SKIP;D(o,e.props.attrs,t),e.props.attrs=t.props.attrs;var a=null;void 0!==(a=t.meta.eventListeners)&&S(o,a,e);var s=t.props.dom;if(void 0!==s&&void 0!==s.innerHTML)return w.SKIP;var l=t.children,u=e.children,c=l.length,v=u.length;if(0===c){if(0!==v){for(var f=null;null!==(f=o.firstChild);)E(f,o);e.children=[]}}else for(var p=c>v?c:v,d=0,h=0;d<p;d++,h++){var m=h<v?u[h]:null,g=d<c?l[d]:null,y=M(m,g,o);switch(y){case w.APPEND:u[v++]=g;break;case w.REMOVE:u.splice(h--,1),v--;break;case w.REPLACE:u[h]=l[d];break;case w.TEXT:m.val=g.val}}return w.CHILDREN}return t.meta.el=e.meta.el,w.SKIP},j=/\s/,I=/"[^"]*"|'[^']*'|\.\w*[a-zA-Z$_]\w*|\w*[a-zA-Z$_]\w*:|(\w*[a-zA-Z$_]\w*)/g,K=["true","false","undefined","null","NaN","typeof","in"],V=function(e,t,r,n,i){var o={current:0,template:e,output:"",openDelimiterLen:t[0].length,closeDelimiterLen:t[1].length,openRE:new RegExp(r[0]),closeRE:new RegExp("\\s*"+r[1]),dependencies:n};return H(o,i),o.output},H=function(e,t){for(var r=e.template,n=r.length;e.current<n;){var i=z(e,e.openRE);if(i&&(e.output+=v(i)),e.current===n)break;e.current+=e.openDelimiterLen,Z(e);var o=z(e,e.closeRE);if(e.current===n)break;0!==o.length&&(q(o,e.dependencies),t&&(o='" + '+o+' + "'),e.output+=o),Z(e),e.current+=e.closeDelimiterLen}},q=function(e,t){return e.replace(I,function(e,r){void 0!==r&&-1===t.indexOf(r)&&-1===K.indexOf(r)&&t.push(r)}),t},z=function(e,t){var r=e.template,n=r.substring(e.current),i=(n.length,n.search(t)),o="";switch(i){case-1:o=n;break;case 0:o="";break;default:o=n.substring(0,i)}return e.current+=o.length,o},Z=function(e){for(var t=e.template,r=t[e.current];j.test(r);)r=t[++e.current]},X=function(e){var t={input:e,current:0,tokens:[]};return F(t),t.tokens},F=function(e){for(var t=e.input,r=t.length;e.current<r;)"<"===t.charAt(e.current)?"\x3c!--"!==t.substr(e.current,4)?Q(e):J(e):B(e)},B=function(e){var t=e.current,r=e.input,n=r.length,i=r.substring(t).search(/<\/?(?:[A-Za-z]+\w*)|<!--/);if(-1===i)return e.tokens.push({type:"text",value:r.slice(t)}),void(e.current=n);0!==i&&(i+=t,e.tokens.push({type:"text",value:r.slice(t,i)}),e.current=i)},J=function(e){var t=e.current,r=e.input,n=r.length;t+=4;var i=r.indexOf("--\x3e",t);-1===i?(e.tokens.push({type:"comment",value:r.slice(t)}),e.current=n):(e.tokens.push({type:"comment",value:r.slice(t,i)}),e.current=i+3)},Q=function(e){var t=e.input,r=(t.length,"/"===t.charAt(e.current+1));e.current+=!0===r?2:1;var n=U(e);W(n,e);var i="/"===t.charAt(e.current);e.current+=!0===i?2:1,!0===r&&(n.closeStart=!0),!0===i&&(n.closeEnd=!0)},U=function(e){for(var t=e.input,r=t.length,n=e.current,i="";n<r;){var o=t.charAt(n);if("/"===o||">"===o||" "===o)break;i+=o,n++}var a={type:"tag",value:i};return e.tokens.push(a),e.current=n,a},W=function(e,t){for(var r=t.input,n=r.length,i=t.current,o=r.charAt(i),a=r.charAt(i+1),s=function(){i++,o=r.charAt(i),a=r.charAt(i+1)},l={};i<n&&">"!==o&&("/"!==o||">"!==a);)if(" "!==o){for(var u="",c=!1;i<n&&"="!==o;){if(" "===o||">"===o||"/"===o&&">"===a){c=!0;break}u+=o,s()}var v={name:u,value:"",meta:{}};if(!0!==c){s();var f=" ";for("'"!==o&&'"'!==o||(f=o,s());i<n&&o!==f;)v.value+=o,s();s();var p=u.indexOf(":");if(-1!==p){var d=u.split(":");v.name=d[0],v.meta.arg=d[1]}l[u]=v}else l[u]=v}else s();t.current=i,e.attributes=l},Y=function(e){for(var t={type:"ROOT",children:[]},r={current:0,tokens:e};r.current<e.length;){var n=ne(r);n&&t.children.push(n)}return t},ee=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],te=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],re=function(e,t,r){return{type:e,props:t,children:r}},ne=function(e){var t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1],i=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1]};if("text"===t.type)return i(),r.value;if("comment"===t.type)return i(),null;if("tag"===t.type){var o=t.value,a=t.closeStart,s=t.closeEnd,l=-1!==te.indexOf(o),u=-1!==ee.indexOf(o)||!0===s,c=re(o,t.attributes,[]);if(i(),l&&(c.isSVG=!0),!0===u)return c;if(!0===a)return null;if(void 0!==t){for(e.current;"tag"!==t.type||"tag"===t.type&&(void 0===t.closeStart&&void 0===t.closeEnd||t.value!==o);){var v=ne(e);if(null!==v&&c.children.push(v),i(0),void 0===t)break}i()}return c}i()},ie=null,oe=null,ae=function(e,t,r){var i=e.props.attrs,o=!1,a="{attrs: {";e.props.directives=[];for(var s in i){var l=i[s],u=null,c=null;void 0!==(u=n[l.name])&&void 0!==(c=u.beforeGenerate)&&c(l.value,l.meta,e,t,r)}for(var v in i){var f=i[v],p=f.name,d=null;if(void 0!==(d=n[p])){var h=e.specialDirectivesAfter;void 0!==d.afterGenerate&&(void 0===h&&(e.specialDirectivesAfter=h={}),h[v]=f);var m=null;void 0!==(m=d.duringPropGenerate)&&(a+=m(f.value,f.meta,e,r)),e.meta.shouldRender=!0,delete i[v]}else if(p[0]+p[1]==="m-")e.props.directives.push(f),e.meta.shouldRender=!0;else{!1===o&&(o=!0);var g=f.value,y=V(g,ie,oe,r,!0);g!==y&&(e.meta.shouldRender=!0),a+='"'+v+'": "'+y+'", '}}!0===o?a=a.slice(0,-2)+"}":a+="}";var $=e.props.dom;if(void 0!==$){e.meta.shouldRender=!0,a+=", dom: {";for(var b in $)a+='"'+b+'": '+$[b]+", ";a=a.slice(0,-2)+"}"}var x=e.props.directives;if(0!==x.length){a+=", directives: {";for(var k=0;k<x.length;k++){var _=x[k],E=_.value;0!==E.length?q(E,r):E='""',a+='"'+_.name+'": '+E+", "}a=a.slice(0,-2)+"}"}return a+="}"},se=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var r in e)t+='"'+r+'": ['+ue(e[r])+"], ";return t=t.slice(0,-2)+"}"},le=function(e){var t="{";for(var r in e)t+="eventListeners"===r?'"'+r+'": '+se(e[r])+", ":'"'+r+'": '+e[r]+", ";return t=t.slice(0,-2)+"}"},ue=function(e){for(var t="",r=0;r<e.length;r++)t+=e[r]+", ";return t=t.slice(0,-2)},ce=function(e,t,r){var n='h("'+e.type+'", ';n+=ae(e,t,r)+", ";for(var i=[],o=e.children,a=0;a<o.length;a++)i.push(ve(o[a],e,r));return!0===e.meta.shouldRender&&void 0!==t&&(t.meta.shouldRender=!0),n+=le(e.meta),0!==i.length?!0===e.deep?n+=", [].concat.apply([], ["+ue(i)+"])":n+=", ["+ue(i)+"]":n+=", []",n+=")"},ve=function(e,t,r){var i="";if("string"==typeof e){var o=e,a=V(o,ie,oe,r,!0),s=R();o!==a&&(t.meta.shouldRender=!0,s.shouldRender=!0),i+='h("#text", '+le(s)+', "'+a+'")'}else{e.meta=R(),!0===e.isSVG&&(e.meta.isSVG=!0),e.props={attrs:e.props};var l="";if("slot"===e.type){t.meta.shouldRender=!0,t.deep=!0;var u=e.props.attrs.name;l="instance.$slots['"+(u&&u.value||"default")+"']"}else l=ce(e,t,r);if(void 0!==e.specialDirectivesAfter)for(var c in e.specialDirectivesAfter){var v=e.specialDirectivesAfter[c];l=n[v.name].afterGenerate(v.value,v.meta,l,e,r)}i+=l}return i},fe=function(e){var r=e.children[0],n=[],i=null;(i=t.config.delimiters)!==ie&&(ie=i,oe=new Array(2),oe[0]=y(ie[0]),oe[1]=y(ie[1]));for(var o=ve(r,void 0,n),a="",s=0;s<n.length;s++){var l=n[s];a+="var "+l+' = instance.get("'+l+'");'}var c="var instance = this; "+a+" return "+o;try{return new Function("h",c)}catch(e){return u("Could not create render function"),$}},pe=function(e){var t=X(e),r=Y(t);return fe(r)};t.prototype.get=function(e){var t=this.$observer,r=null;return null!==(r=t.target)&&(void 0===t.map[e]?t.map[e]=[r]:-1===t.map[e].indexOf(r)&&t.map[e].push(r)),this.$data[e]},t.prototype.set=function(e,t){var r=this.$observer,n=f(0,this.$data,e,t),i=null;void 0!==(i=r.setters[n])&&i.call(this,t),r.notify(n,t),c(this)},t.prototype.destroy=function(){this.off(),this.$el=null,this.$destroyed=!0,g(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$data[e].apply(this,t)},t.prototype.on=function(e,t){var r=this.$events[e];void 0===r?this.$events[e]=[t]:r.push(t)},t.prototype.off=function(e,t){if(void 0===e)this.$events={};else if(void 0===t)this.$events[e]=[];else{var r=this.$events[e],n=r.indexOf(t);r.splice(n,1)}},t.prototype.emit=function(e,t){var r=t||{};r.type=e;var n=this.$events[e],i=this.$events["*"];if(void 0!==n)for(var o=0;o<n.length;o++)n[o](r);if(void 0!==i)for(var o=0;o<i.length;o++)i[o](r)},t.prototype.renderLoop=function(e,t){var r=null;if(Array.isArray(e)){r=new Array(e.length);for(var n=0;n<e.length;n++)r[n]=t(e[n],n)}else if("object"==typeof e){r=[];for(var i in e)r.push(t(e[i],i))}else if("number"==typeof e){r=new Array(e);for(var o=0;o<e;o++)r[o]=t(o+1,o)}return r},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var r=0;r<e.length;r++)t+=this.renderClass(e[r])+" ";else if("object"==typeof e)for(var n in e)e[n]&&(t+=n+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el="string"==typeof e?document.querySelector(e):e,this.$destroyed=!1,this.$el.__moon__=this,m(this,"$template",this.$options.template,this.$el.outerHTML),this.$render===$&&(this.$render=t.compile(this.$template)),this.build(),g(this,"mounted")},t.prototype.render=function(){return this.$render(P)},t.prototype.patch=function(e,t,r){if(void 0!==e.meta)t.type!==e.type?(A(e.meta.el,k(t),r),this.$el=t.meta.el,this.$el.__moon__=this):M(e,t,r);else if(e instanceof Node){var n=N(e,t,r);n!==e&&(this.$el=t.meta.el,this.$el.__moon__=this)}},t.prototype.build=function(){var e=this.render(),t=null;void 0!==this.$dom.meta?t=this.$dom:(t=this.$el,this.$dom=e),this.patch(t,e,this.$el.parentNode)},t.prototype.init=function(){l("======= Moon ======="),g(this,"init");var e=this.$options.el;void 0!==e&&this.mount(e)},t.config={silent:!0,delimiters:["{{","}}"],keyCodes:function(e){for(var t in e)o[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.10.0",t.util={noop:$,error:u,log:l,merge:h,extend:d,h:P},t.use=function(e,r){e.init(t,r)},t.compile=function(e){return pe(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,t){r["m-"+e]=t},t.component=function(e,r){function n(){t.call(this,r)}var o=this;return void 0!==r.name?e=r.name:r.name=e,void 0!==r.data&&"function"!=typeof r.data&&u("In components, data must be a function returning an object"),n.prototype=Object.create(o.prototype),n.prototype.constructor=n,n.prototype.init=function(){g(this,"init");var e=this.$options;this.$destroyed=!1,m(this,"$props",e.props,[]);var r=e.template;this.$template=r,this.$render===$&&(this.$render=t.compile(r))},i[e]={CTor:n,options:r},n};var de='h("#text", '+le(R())+', "")';return n["m-if"]={afterGenerate:function(e,t,r,n,i){return q(e,i),e+" ? "+r+" : "+de}},n["m-for"]={beforeGenerate:function(e,t,r,n,i){n.deep=!0},afterGenerate:function(e,t,r,n,i){var o=e.split(" in "),a=o[0].split(","),s=o[1];q(s,i);for(var l=a.join(","),u=0;u<a.length;u++){var c=i.indexOf(a[u]);-1!==c&&i.splice(c,1)}return"instance.renderLoop("+s+", function("+l+") { return "+r+"; })"}},n["m-on"]={beforeGenerate:function(e,t,r,n,i){var a=e,s=t.arg.split("."),l=s.shift(),u="event",c=a.split("(");c.length>1&&(a=c.shift(),u=c.join("(").slice(0,-1),q(u,i));for(var v="",f=0;f<s.length;f++)v+=o[s[f]];C(l,"function(event) {"+v+'instance.callMethod("'+a+'", ['+u+"])}",r)}},n["m-model"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.attrs;q(e,i);var a="input",s="value",l=e,u=e,c="event.target."+s,v=o.type;if(void 0!==v){v=v.value;var f=!1;if("checkbox"===v||"radio"===v&&(f=!0))if(a="change",s="checked",!0===f){var p=o.value,d=void 0===p?"null":'"'+V(p.value,ie,oe,i,!0)+'"';l=l+" === "+d,c=d}else c="event.target."+s}var h=u.indexOf("["),m=u.indexOf("."),g=null,y=null,$=-1;-1===h&&-1===m||($=-1===h?m:-1===m?h:h<m?h:m,g=e.substring(0,$),y=e.substring($),u=g+y.replace(I,function(e,t){return void 0!==t?'" + '+t+' + "':e})),C(a,'function(event) {instance.set("'+u+'", '+c+")}",r);var b=r.props.dom;void 0===b&&(r.props.dom=b={}),b[s]=l}},n["m-literal"]={duringPropGenerate:function(e,t,r,n){var i=t.arg;return q(e,n),"class"===i?'"class": instance.renderClass('+e+"), ":'"'+i+'": '+e+", "}},n["m-html"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.dom;void 0===o&&(r.props.dom=o={}),q(e,i),o.innerHTML='("" + '+e+")"}},n["m-mask"]={},r["m-show"]=function(e,t,r){e.style.display=t?"":"none"},t});
\ No newline at end of file
+!function(e,t){"object"==typeof module&&module.exports?module.exports=t():e.Moon=t()}(this,function(){"use strict";function e(e){this.instance=e,this.cache={},this.setters={},this.clear={},this.target=null,this.map={}}function t(t){void 0===t&&(t={}),this.$options=t;var r=this;m(this,"$name",t.name,"root");var n=t.data;this.$data=void 0===n?{}:"function"==typeof n?n():n,m(this,"$render",t.render,$),m(this,"$hooks",t.hooks,{});var i=t.methods;void 0!==i&&a(r,i),this.$events={},this.$dom={},this.$observer=new e(this),this.$destroyed=!0,this.$queued=!1;var o=t.computed;void 0!==o&&s(this,o),this.init()}var r={},n={},i={},o={stop:"event.stopPropagation();",prevent:"event.preventDefault();",ctrl:"if(!event.ctrlKey) {return;};",shift:"if(!event.shiftKey) {return;};",alt:"if(!event.altKey) {return;};",enter:"if(event.keyCode !== 13) {return;};"},a=function(e,t){for(var r in t)!function(t,r){e.$data[t]=function(){return r.apply(e,arguments)}}(r,t[r])},s=function(e,t){for(var r in t)!function(r){var n=e.$observer;n.observe(r),Object.defineProperty(e.$data,r,{get:function(){var i=null;return void 0===n.cache[r]?(n.target=r,i=t[r].get.call(e),n.target=null,n.cache[r]=i):i=n.cache[r],i},set:$});var i=null;void 0!==(i=t[r].set)&&(n.setters[r]=i)}(r)};e.prototype.observe=function(e){var t=this;this.clear[e]=function(){t.cache[e]=void 0}},e.prototype.notify=function(e,t){var r=null;if(void 0!==(r=this.map[e]))for(var n=0;n<r.length;n++)this.notify(r[n]);var i=null;void 0!==(i=this.clear[e])&&i()};var l=function(e){!1===t.config.silent&&console.log(e)},u=function(e){!1===t.config.silent&&console.error("[Moon] ERR: "+e)},c=function(e){!1===e.$queued&&!1===e.$destroyed&&(e.$queued=!0,setTimeout(function(){e.build(),g(e,"updated"),e.$queued=!1},0))},v=function(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\n/g,"\\n")},f=function(e,t,r,n){r=r.replace(/\[(\w+)\]/g,".$1");for(var i=r.split("."),o=0;o<i.length-1;o++){t=t[i[o]]}return t[i[o]]=n,i[0]},p=function(e){var t={};if(t.default=[],0===e.length)return t;for(var r=0;r<e.length;r++){var n=e[r],i=n.props.attrs,o="",a=null;void 0!==(o=i.slot)?(a=t[o],void 0===a?t[o]=[n]:a.push(n),delete i.slot):t.default.push(n)}return t},d=function(e,t){for(var r in t)e[r]=t[r];return e},h=function(e,t){var r={};for(var n in e)r[n]=e[n];for(var n in t)r[n]=t[n];return r},m=function(e,t,r,n){e[t]=void 0===r?n:r},g=function(e,t){var r=e.$hooks[t];void 0!==r&&r.call(e)},y=function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},$=function(){},b=function(e){for(var t={},r=e.attributes,n=r.length;n--;)t[r[n].name]=r[n].value;return t},x=function(e,t){for(var r in t)!function(r){var n=function(e){for(var t=n.handlers,r=0;r<t.length;r++)t[r](e)};n.handlers=t[r],t[r]=n,e.addEventListener(r,n)}(r)},k=function(e){var t=null;if("#text"===e.type)t=document.createTextNode(e.val);else{if(t=e.meta.isSVG?document.createElementNS("http://www.w3.org/2000/svg",e.type):document.createElement(e.type),1===e.children.length&&"#text"===e.children[0].type)t.textContent=e.children[0].val,e.children[0].meta.el=t.firstChild;else for(var r=0;r<e.children.length;r++){var n=e.children[r];E(k(n),n,t)}var i=null;void 0!==(i=e.meta.eventListeners)&&x(t,i)}return D(t,{},e,e.props.attrs),e.meta.el=t,t},E=function(e,t,r){r.appendChild(e);var n=null;void 0!==(n=t.meta.component)&&T(e,t,n)},_=function(e,t){var r=null;void 0!==(r=e.__moon__)&&r.destroy(),t.removeChild(e)},A=function(e,t,r,n){e.__moon__&&e.__moon__.destroy(),n.replaceChild(t,e);var i=null;void 0!==(i=r.meta.component)&&T(t,r,i)},w={SKIP:0,APPEND:1,REMOVE:2,REPLACE:3,TEXT:4,CHILDREN:5},R=function(){return{shouldRender:!1}},C=function(e,t,r){var n=r.meta,i=n.eventListeners;void 0===i&&(i=n.eventListeners={});var o=i[e];void 0===o?i[e]=[t]:o.push(t)},L=function(e,t,r,n,i){return{type:e,val:t,props:r,children:i,meta:n||R()}},O=function(e,t,r){var n=r.options.data||{};if(void 0!==r.options.props)for(var i=r.options.props,o=0;o<i.length;o++){var a=i[o];n[a]=e.attrs[a]}return r.options.render(P,{data:n,slots:p(t)})},P=function(e,t,r,n){var o=null;if("#text"===e)return L("#text",r,{attrs:{}},t,[]);if(void 0!==(o=i[e])){if(!0===o.options.functional)return O(t,n,o);r.component=o}return L(e,"",t,r,n)},T=function(e,t,r){for(var n=new r.CTor,i=n.$props,o=n.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]=a[l]}return n.$slots=p(t.children),n.$el=e,n.build(),g(n,"mounted"),t.meta.el=n.$el,n.$el},S=function(e,t,r){for(var n in t){var i=r[n];void 0===i?e.removeEventListener(n,i):r[n].handlers=t[n]}},D=function(e,t,n){var i=n.props.attrs;for(var o in i){var a=i[o],s=t[o];void 0===a&&!1===a&&null===a||void 0!==s&&!1!==s&&null!==s&&a===s||(10===o.length&&"xlink:href"===o?e.setAttributeNS("http://www.w3.org/1999/xlink","href",a):e.setAttribute(o,!0===a?"":a))}for(var l in t){var u=i[l];void 0!==u&&!1!==u&&null!==u||e.removeAttribute(l)}var c=null;if(void 0!==(c=n.props.directives))for(var v in c){var f=null;void 0!==(f=r[v])&&f(e,c[v],n)}var p=null;if(void 0!==(p=n.props.dom))for(var d in p){var h=p[d];e[d]!==h&&(e[d]=h)}},G=function(e,t){if(void 0===e.__moon__)T(e,t,t.meta.component);else{for(var r=e.__moon__,n=!1,i=r.$props,o=r.$data,a=t.props.attrs,s=0;s<i.length;s++){var l=i[s];o[l]!==a[l]&&(o[l]=a[l],n=!0)}0!==t.children.length&&(r.$slots=p(t.children),n=!0),!0===n&&r.build()}},N=function(e,t,r){var n=null!==e?e.nodeName.toLowerCase():null;if(null===e){var i=k(t);return E(i,t,r),i}if(null===t)return _(e,r),null;if(n!==t.type){var o=k(t);return A(e,o,t,r),o}if("#text"===t.type)return"#text"===n?(e.textContent!==t.val&&(e.textContent=t.val),t.meta.el=e):A(e,k(t),t,r),e;if(t.meta.el=e,void 0!==t.meta.component)return G(e,t),e;D(e,b(e),t);var a=null;void 0!==(a=t.meta.eventListeners)&&x(e,a);var s=t.props.dom;if(void 0!==s&&void 0!==s.innerHTML)return e;for(var l=t.children,u=l.length,c=0,v=e.firstChild,f=0!==u?l[0]:null;null!==f||null!==v;){var p=null!==v?v.nextSibling:null;N(v,f,e),f=++c<u?l[c]:null,v=p}return e},M=function(e,t,r){if(null===e)return E(k(t),t,r),w.APPEND;if(null===t)return _(e.meta.el,r),w.REMOVE;if(e===t)return w.SKIP;if(e.type!==t.type)return A(e.meta.el,k(t),t,r),w.REPLACE;if(!0===t.meta.shouldRender&&"#text"===t.type){var n=e.meta.el;return"#text"===e.type?(t.val!==e.val&&(n.textContent=t.val),w.TEXT):(A(n,k(t),t,r),w.REPLACE)}if(!0===t.meta.shouldRender){var i=e.meta.el;if(void 0!==t.meta.component)return G(i,t),w.SKIP;D(i,e.props.attrs,t),e.props.attrs=t.props.attrs;var o=null;void 0!==(o=t.meta.eventListeners)&&S(i,o,e.meta.eventListeners);var a=t.props.dom;if(void 0!==a&&void 0!==a.innerHTML)return w.SKIP;var s=t.children,l=e.children,u=s.length,c=l.length;if(0===u){if(0!==c){for(var v=null;null!==(v=i.firstChild);)_(v,i);e.children=[]}}else for(var f=u>c?u:c,p=0,d=0;p<f;p++,d++){var h=d<c?l[d]:null,m=p<u?s[p]:null,g=M(h,m,i);switch(g){case w.APPEND:l[c++]=m;break;case w.REMOVE:l.splice(d--,1),c--;break;case w.REPLACE:l[d]=s[p];break;case w.TEXT:h.val=m.val}}return w.CHILDREN}return t.meta.el=e.meta.el,w.SKIP},j=/\s/,I=/"[^"]*"|'[^']*'|\.\w*[a-zA-Z$_]\w*|\w*[a-zA-Z$_]\w*:|(\w*[a-zA-Z$_]\w*)/g,K=["true","false","undefined","null","NaN","typeof","in"],V=function(e,t,r,n,i){var o={current:0,template:e,output:"",openDelimiterLen:t[0].length,closeDelimiterLen:t[1].length,openRE:new RegExp(r[0]),closeRE:new RegExp("\\s*"+r[1]),dependencies:n};return H(o,i),o.output},H=function(e,t){for(var r=e.template,n=r.length;e.current<n;){var i=z(e,e.openRE);if(i&&(e.output+=v(i)),e.current===n)break;e.current+=e.openDelimiterLen,Z(e);var o=z(e,e.closeRE);if(e.current===n)break;0!==o.length&&(q(o,e.dependencies),t&&(o='" + '+o+' + "'),e.output+=o),Z(e),e.current+=e.closeDelimiterLen}},q=function(e,t){return e.replace(I,function(e,r){void 0!==r&&-1===t.indexOf(r)&&-1===K.indexOf(r)&&t.push(r)}),t},z=function(e,t){var r=e.template,n=r.substring(e.current),i=(n.length,n.search(t)),o="";switch(i){case-1:o=n;break;case 0:o="";break;default:o=n.substring(0,i)}return e.current+=o.length,o},Z=function(e){for(var t=e.template,r=t[e.current];j.test(r);)r=t[++e.current]},X=function(e){var t={input:e,current:0,tokens:[]};return F(t),t.tokens},F=function(e){for(var t=e.input,r=t.length;e.current<r;)"<"===t.charAt(e.current)?"\x3c!--"!==t.substr(e.current,4)?Q(e):J(e):B(e)},B=function(e){var t=e.current,r=e.input,n=r.length,i=r.substring(t).search(/<\/?(?:[A-Za-z]+\w*)|<!--/);if(-1===i)return e.tokens.push({type:"text",value:r.slice(t)}),void(e.current=n);0!==i&&(i+=t,e.tokens.push({type:"text",value:r.slice(t,i)}),e.current=i)},J=function(e){var t=e.current,r=e.input,n=r.length;t+=4;var i=r.indexOf("--\x3e",t);-1===i?(e.tokens.push({type:"comment",value:r.slice(t)}),e.current=n):(e.tokens.push({type:"comment",value:r.slice(t,i)}),e.current=i+3)},Q=function(e){var t=e.input,r=(t.length,"/"===t.charAt(e.current+1));e.current+=!0===r?2:1;var n=U(e);W(n,e);var i="/"===t.charAt(e.current);e.current+=!0===i?2:1,!0===r&&(n.closeStart=!0),!0===i&&(n.closeEnd=!0)},U=function(e){for(var t=e.input,r=t.length,n=e.current,i="";n<r;){var o=t.charAt(n);if("/"===o||">"===o||" "===o)break;i+=o,n++}var a={type:"tag",value:i};return e.tokens.push(a),e.current=n,a},W=function(e,t){for(var r=t.input,n=r.length,i=t.current,o=r.charAt(i),a=r.charAt(i+1),s=function(){i++,o=r.charAt(i),a=r.charAt(i+1)},l={};i<n&&">"!==o&&("/"!==o||">"!==a);)if(" "!==o){for(var u="",c=!1;i<n&&"="!==o;){if(" "===o||">"===o||"/"===o&&">"===a){c=!0;break}u+=o,s()}var v={name:u,value:"",meta:{}};if(!0!==c){s();var f=" ";for("'"!==o&&'"'!==o||(f=o,s());i<n&&o!==f;)v.value+=o,s();s();var p=u.indexOf(":");if(-1!==p){var d=u.split(":");v.name=d[0],v.meta.arg=d[1]}l[u]=v}else l[u]=v}else s();t.current=i,e.attributes=l},Y=function(e){for(var t={type:"ROOT",children:[]},r={current:0,tokens:e};r.current<e.length;){var n=ne(r);n&&t.children.push(n)}return t},ee=["area","base","br","command","embed","hr","img","input","keygen","link","meta","param","source","track","wbr"],te=["svg","animate","circle","clippath","cursor","defs","desc","ellipse","filter","font-face","foreignObject","g","glyph","image","line","marker","mask","missing-glyph","path","pattern","polygon","polyline","rect","switch","symbol","text","textpath","tspan","use","view"],re=function(e,t,r){return{type:e,props:t,children:r}},ne=function(e){var t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1],i=function(i){e.current+=void 0===i?1:i,t=e.tokens[e.current],r=e.tokens[e.current-1],n=e.tokens[e.current+1]};if("text"===t.type)return i(),r.value;if("comment"===t.type)return i(),null;if("tag"===t.type){var o=t.value,a=t.closeStart,s=t.closeEnd,l=-1!==te.indexOf(o),u=-1!==ee.indexOf(o)||!0===s,c=re(o,t.attributes,[]);if(i(),l&&(c.isSVG=!0),!0===u)return c;if(!0===a)return null;if(void 0!==t){for(e.current;"tag"!==t.type||"tag"===t.type&&(void 0===t.closeStart&&void 0===t.closeEnd||t.value!==o);){var v=ne(e);if(null!==v&&c.children.push(v),i(0),void 0===t)break}i()}return c}i()},ie=null,oe=null,ae=function(e,t,r){var i=e.props.attrs,o=!1,a="{attrs: {";e.props.directives=[];for(var s in i){var l=i[s],u=null,c=null;void 0!==(u=n[l.name])&&void 0!==(c=u.beforeGenerate)&&c(l.value,l.meta,e,t,r)}for(var v in i){var f=i[v],p=f.name,d=null;if(void 0!==(d=n[p])){var h=e.specialDirectivesAfter;void 0!==d.afterGenerate&&(void 0===h&&(e.specialDirectivesAfter=h={}),h[v]=f);var m=null;void 0!==(m=d.duringPropGenerate)&&(a+=m(f.value,f.meta,e,r)),e.meta.shouldRender=!0,delete i[v]}else if(p[0]+p[1]==="m-")e.props.directives.push(f),e.meta.shouldRender=!0;else{!1===o&&(o=!0);var g=f.value,y=V(g,ie,oe,r,!0);g!==y&&(e.meta.shouldRender=!0),a+='"'+v+'": "'+y+'", '}}!0===o?a=a.slice(0,-2)+"}":a+="}";var $=e.props.dom;if(void 0!==$){e.meta.shouldRender=!0,a+=", dom: {";for(var b in $)a+='"'+b+'": '+$[b]+", ";a=a.slice(0,-2)+"}"}var x=e.props.directives;if(0!==x.length){a+=", directives: {";for(var k=0;k<x.length;k++){var E=x[k],_=E.value;0!==_.length?q(_,r):_='""',a+='"'+E.name+'": '+_+", "}a=a.slice(0,-2)+"}"}return a+="}"},se=function(e){if(0===Object.keys(e).length)return"{}";var t="{";for(var r in e)t+='"'+r+'": ['+ue(e[r])+"], ";return t=t.slice(0,-2)+"}"},le=function(e){var t="{";for(var r in e)t+="eventListeners"===r?'"'+r+'": '+se(e[r])+", ":'"'+r+'": '+e[r]+", ";return t=t.slice(0,-2)+"}"},ue=function(e){for(var t="",r=0;r<e.length;r++)t+=e[r]+", ";return t=t.slice(0,-2)},ce=function(e,t,r){var n='h("'+e.type+'", ';n+=ae(e,t,r)+", ";for(var i=[],o=e.children,a=0;a<o.length;a++)i.push(ve(o[a],e,r));return!0===e.meta.shouldRender&&void 0!==t&&(t.meta.shouldRender=!0),n+=le(e.meta),0!==i.length?!0===e.deep?n+=", [].concat.apply([], ["+ue(i)+"])":n+=", ["+ue(i)+"]":n+=", []",n+=")"},ve=function(e,t,r){var i="";if("string"==typeof e){var o=e,a=V(o,ie,oe,r,!0),s=R();o!==a&&(t.meta.shouldRender=!0,s.shouldRender=!0),i+='h("#text", '+le(s)+', "'+a+'")'}else{e.meta=R(),!0===e.isSVG&&(e.meta.isSVG=!0),e.props={attrs:e.props};var l="";if("slot"===e.type){t.meta.shouldRender=!0,t.deep=!0;var u=e.props.attrs.name;l="instance.$slots['"+(u&&u.value||"default")+"']"}else l=ce(e,t,r);if(void 0!==e.specialDirectivesAfter)for(var c in e.specialDirectivesAfter){var v=e.specialDirectivesAfter[c];l=n[v.name].afterGenerate(v.value,v.meta,l,e,r)}i+=l}return i},fe=function(e){var r=e.children[0],n=[],i=null;(i=t.config.delimiters)!==ie&&(ie=i,oe=new Array(2),oe[0]=y(ie[0]),oe[1]=y(ie[1]));for(var o=ve(r,void 0,n),a="",s=0;s<n.length;s++){var l=n[s];a+="var "+l+' = instance.get("'+l+'");'}var c="var instance = this; "+a+" return "+o;try{return new Function("h",c)}catch(e){return u("Could not create render function"),$}},pe=function(e){var t=X(e),r=Y(t);return fe(r)};t.prototype.get=function(e){var t=this.$observer,r=null;return null!==(r=t.target)&&(void 0===t.map[e]?t.map[e]=[r]:-1===t.map[e].indexOf(r)&&t.map[e].push(r)),this.$data[e]},t.prototype.set=function(e,t){var r=this.$observer,n=f(0,this.$data,e,t),i=null;void 0!==(i=r.setters[n])&&i.call(this,t),r.notify(n,t),c(this)},t.prototype.destroy=function(){this.off(),this.$el=null,this.$destroyed=!0,g(this,"destroyed")},t.prototype.callMethod=function(e,t){t=t||[],this.$data[e].apply(this,t)},t.prototype.on=function(e,t){var r=this.$events[e];void 0===r?this.$events[e]=[t]:r.push(t)},t.prototype.off=function(e,t){if(void 0===e)this.$events={};else if(void 0===t)this.$events[e]=[];else{var r=this.$events[e],n=r.indexOf(t);r.splice(n,1)}},t.prototype.emit=function(e,t){var r=t||{};r.type=e;var n=this.$events[e],i=this.$events["*"];if(void 0!==n)for(var o=0;o<n.length;o++)n[o](r);if(void 0!==i)for(var o=0;o<i.length;o++)i[o](r)},t.prototype.renderLoop=function(e,t){var r=null;if(Array.isArray(e)){r=new Array(e.length);for(var n=0;n<e.length;n++)r[n]=t(e[n],n)}else if("object"==typeof e){r=[];for(var i in e)r.push(t(e[i],i))}else if("number"==typeof e){r=new Array(e);for(var o=0;o<e;o++)r[o]=t(o+1,o)}return r},t.prototype.renderClass=function(e){if("string"==typeof e)return e;var t="";if(Array.isArray(e))for(var r=0;r<e.length;r++)t+=this.renderClass(e[r])+" ";else if("object"==typeof e)for(var n in e)e[n]&&(t+=n+" ");return t=t.slice(0,-1)},t.prototype.mount=function(e){this.$el="string"==typeof e?document.querySelector(e):e,this.$destroyed=!1,this.$el.__moon__=this,m(this,"$template",this.$options.template,this.$el.outerHTML),this.$render===$&&(this.$render=t.compile(this.$template)),this.build(),g(this,"mounted")},t.prototype.render=function(){return this.$render(P)},t.prototype.patch=function(e,t,r){if(void 0!==e.meta)if(t.type!==e.type){var n=k(t);A(e.meta.el,n,t,r),n.__moon__=this,this.$el=n}else M(e,t,r);else if(e instanceof Node){var i=N(e,t,r);i!==e&&(this.$el=t.meta.el,this.$el.__moon__=this)}},t.prototype.build=function(){var e=this.render(),t=null;void 0!==this.$dom.meta?t=this.$dom:(t=this.$el,this.$dom=e),this.patch(t,e,this.$el.parentNode)},t.prototype.init=function(){l("======= Moon ======="),g(this,"init");var e=this.$options.el;void 0!==e&&this.mount(e)},t.config={silent:!0,delimiters:["{{","}}"],keyCodes:function(e){for(var t in e)o[t]="if(event.keyCode !== "+e[t]+") {return;};"}},t.version="0.10.0",t.util={noop:$,error:u,log:l,merge:h,extend:d,h:P},t.use=function(e,r){e.init(t,r)},t.compile=function(e){return pe(e)},t.nextTick=function(e){setTimeout(e,0)},t.directive=function(e,t){r["m-"+e]=t},t.component=function(e,r){function n(){t.call(this,r)}var o=this;return void 0!==r.name?e=r.name:r.name=e,void 0!==r.data&&"function"!=typeof r.data&&u("In components, data must be a function returning an object"),n.prototype=Object.create(o.prototype),n.prototype.constructor=n,n.prototype.init=function(){g(this,"init");var e=this.$options;this.$destroyed=!1,m(this,"$props",e.props,[]);var r=e.template;this.$template=r,this.$render===$&&(this.$render=t.compile(r))},i[e]={CTor:n,options:r},n};var de='h("#text", '+le(R())+', "")';return n["m-if"]={afterGenerate:function(e,t,r,n,i){return q(e,i),e+" ? "+r+" : "+de}},n["m-for"]={beforeGenerate:function(e,t,r,n,i){n.deep=!0},afterGenerate:function(e,t,r,n,i){var o=e.split(" in "),a=o[0].split(","),s=o[1];q(s,i);for(var l=a.join(","),u=0;u<a.length;u++){var c=i.indexOf(a[u]);-1!==c&&i.splice(c,1)}return"instance.renderLoop("+s+", function("+l+") { return "+r+"; })"}},n["m-on"]={beforeGenerate:function(e,t,r,n,i){var a=e,s=t.arg.split("."),l=s.shift(),u="event",c=a.split("(");c.length>1&&(a=c.shift(),u=c.join("(").slice(0,-1),q(u,i));for(var v="",f=0;f<s.length;f++)v+=o[s[f]];C(l,"function(event) {"+v+'instance.callMethod("'+a+'", ['+u+"])}",r)}},n["m-model"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.attrs;q(e,i);var a="input",s="value",l=e,u=e,c="event.target."+s,v=o.type;if(void 0!==v){v=v.value;var f=!1;if("checkbox"===v||"radio"===v&&(f=!0))if(a="change",s="checked",!0===f){var p=o.value,d=void 0===p?"null":'"'+V(p.value,ie,oe,i,!0)+'"';l=l+" === "+d,c=d}else c="event.target."+s}var h=u.indexOf("["),m=u.indexOf("."),g=null,y=null,$=-1;-1===h&&-1===m||($=-1===h?m:-1===m?h:h<m?h:m,g=e.substring(0,$),y=e.substring($),u=g+y.replace(I,function(e,t){return void 0!==t?'" + '+t+' + "':e})),C(a,'function(event) {instance.set("'+u+'", '+c+")}",r);var b=r.props.dom;void 0===b&&(r.props.dom=b={}),b[s]=l}},n["m-literal"]={duringPropGenerate:function(e,t,r,n){var i=t.arg;return q(e,n),"class"===i?'"class": instance.renderClass('+e+"), ":'"'+i+'": '+e+", "}},n["m-html"]={beforeGenerate:function(e,t,r,n,i){var o=r.props.dom;void 0===o&&(r.props.dom=o={}),q(e,i),o.innerHTML='("" + '+e+")"}},n["m-mask"]={},r["m-show"]=function(e,t,r){e.style.display=t?"":"none"},t});
\ No newline at end of file
diff --git a/src/instance/methods.js b/src/instance/methods.js
index b53d9527..a1d25ca1 100644
--- a/src/instance/methods.js
+++ b/src/instance/methods.js
@@ -271,11 +271,12 @@ Moon.prototype.patch = function(old, vnode, parent) {
     if(vnode.type !== old.type) {
       // Root Element Changed During Diff
       // Replace Root Element
-      replaceChild(old.meta.el, createNodeFromVNode(vnode), parent);
+      const newRoot = createNodeFromVNode(vnode);
+      replaceChild(old.meta.el, newRoot, vnode, parent);
 
       // Update Bound Instance
-      this.$el = vnode.meta.el;
-      this.$el.__moon__ = this;
+      newRoot.__moon__ = this;
+      this.$el = newRoot;
     } else {
       // Diff
       diff(old, vnode, parent);
diff --git a/src/util/dom.js b/src/util/dom.js
index 5d2eed11..cb988f25 100644
--- a/src/util/dom.js
+++ b/src/util/dom.js
@@ -66,7 +66,10 @@ const createNodeFromVNode = function(vnode) {
       }
     }
     // Add all event listeners
-    addEventListeners(el, vnode);
+    let eventListeners = null;
+    if((eventListeners = vnode.meta.eventListeners) !== undefined) {
+      addEventListeners(el, eventListeners);
+    }
   }
 
   // Setup Props
@@ -89,8 +92,9 @@ const appendChild = function(node, vnode, parent) {
   parent.appendChild(node);
 
   // Check for Component
-  if(vnode.meta.component) {
-    createComponentFromVNode(node, vnode, vnode.meta.component);
+  let component = null;
+  if((component = vnode.meta.component) !== undefined) {
+    createComponentFromVNode(node, vnode, component);
   }
 }
 
@@ -101,9 +105,10 @@ const appendChild = function(node, vnode, parent) {
  */
 const removeChild = function(node, parent) {
   // Check for Component
-  if(node.__moon__) {
+  let componentInstance = null;
+  if((componentInstance = node.__moon__) !== undefined) {
     // Component was unmounted, destroy it here
-    node.__moon__.destroy();
+    componentInstance.destroy();
   }
 
   // Remove the Node
@@ -128,7 +133,8 @@ const replaceChild = function(oldNode, newNode, vnode, parent) {
   parent.replaceChild(newNode, oldNode);
 
   // Check for Component
-  if(vnode.meta.component) {
-    createComponentFromVNode(newNode, vnode, vnode.meta.component);
+  let component = null;
+  if((component = vnode.meta.component) !== undefined) {
+    createComponentFromVNode(newNode, vnode, component);
   }
 }
diff --git a/src/util/util.js b/src/util/util.js
index eb6ea956..f6f5196c 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -90,12 +90,14 @@ const getSlots = function(children) {
     const child = children[i];
     const childProps = child.props.attrs;
     let slotName = "";
+    let slotValue = null;
 
     if((slotName = childProps.slot) !== undefined) {
-      if(slots[slotName] === undefined) {
+      slotValue = slots[slotName];
+      if(slotValue === undefined) {
         slots[slotName] = [child];
       } else {
-        slots[slotName].push(child);
+        slotValue.push(child);
       }
       delete childProps.slot;
     } else {
diff --git a/src/util/vdom.js b/src/util/vdom.js
index 5d283ed1..636e1c2b 100644
--- a/src/util/vdom.js
+++ b/src/util/vdom.js
@@ -111,7 +111,7 @@ const h = function(tag, attrs, meta, children) {
   } else if((component = components[tag]) !== undefined) {
     // Resolve Component
     if(component.options.functional === true) {
-      return createFunctionalComponent(attrs, children, components[tag]);
+      return createFunctionalComponent(attrs, children, component);
     } else {
       meta.component = component;
     }
@@ -168,9 +168,7 @@ const createComponentFromVNode = function(node, vnode, component) {
  * @param {Object} eventListeners
  * @param {Object} oldVNode
  */
-const diffEventListeners = function(node, eventListeners, oldVNode) {
-  const oldEventListeners = oldVNode.meta.eventListeners;
-
+const diffEventListeners = function(node, eventListeners, oldEventListeners) {
   for(const type in eventListeners) {
     const oldEventListener = oldEventListeners[type];
     if(oldEventListener === undefined) {
@@ -284,7 +282,7 @@ const diffComponent = function(node, vnode) {
  * @return {Object} adjusted node only if it was replaced
  */
 const hydrate = function(node, vnode, parent) {
-  let nodeName = node ? node.nodeName.toLowerCase() : null;
+  const nodeName = node !== null ? node.nodeName.toLowerCase() : null;
 
   if(node === null) {
     // No node, create one
@@ -367,10 +365,9 @@ const hydrate = function(node, vnode, parent) {
  * @param {Object} oldVNode
  * @param {Object} vnode
  * @param {Object} parent
- * @param {Object} instance
  * @return {Number} patch type
  */
-const diff = function(oldVNode, vnode, parent, instance) {
+const diff = function(oldVNode, vnode, parent) {
   if(oldVNode === null) {
     // No Node, append a node
     appendChild(createNodeFromVNode(vnode), vnode, parent);
@@ -424,7 +421,7 @@ const diff = function(oldVNode, vnode, parent, instance) {
     // Diff event listeners
     let eventListeners = null;
     if((eventListeners = vnode.meta.eventListeners) !== undefined) {
-      diffEventListeners(node, eventListeners, oldVNode);
+      diffEventListeners(node, eventListeners, oldVNode.meta.eventListeners);
     }
 
     // Check if innerHTML was changed, don't diff children
diff --git a/test/js/test.js b/test/js/test.js
index c3b9b7f6..9284f043 100644
--- a/test/js/test.js
+++ b/test/js/test.js
@@ -641,7 +641,7 @@ describe('Custom Render', function() {
     var renderApp = new Moon({
       el: "#render",
       render: function(h) {
-        return h('div', {attrs: {id: "render"}}, {shouldRender: true, eventListeners: {}}, [h("#text", {shouldRender: true, eventListeners: {}}, this.get('msg'))])
+        return h('div', {attrs: {id: "render"}}, {shouldRender: true}, [h("#text", {shouldRender: true}, this.get('msg'))])
       },
       data: {
         msg: "Hello Moon!"
@@ -666,7 +666,7 @@ describe('Functional Component', function() {
       functional: true,
       props: ['someprop'],
       render: function(h, ctx) {
-        return h("h1", functionalComponentDivProps, {shouldRender: true, eventListeners: {}}, [h("#text", {shouldRender: true, eventListeners: {}}, ctx.data.someprop)]);
+        return h("h1", functionalComponentDivProps, {shouldRender: true}, [h("#text", {shouldRender: true}, ctx.data.someprop)]);
       }
     });
     var functionalComponentDivSlotProps = {attrs: {}};
@@ -674,7 +674,7 @@ describe('Functional Component', function() {
     Moon.component('slot-functional-component', {
       functional: true,
       render: function(h, ctx) {
-        return h("div", functionalComponentDivSlotProps, {shouldRender: true, eventListeners: {}}, [h("h1", {}, {shouldRender: true, eventListeners: {}}, ctx.slots['default']), h("h1", {}, {shouldRender: true, eventListeners: {}}, ctx.slots.named)]);
+        return h("div", functionalComponentDivSlotProps, {shouldRender: true}, [h("h1", {}, {shouldRender: true}, ctx.slots['default']), h("h1", {}, {shouldRender: true}, ctx.slots.named)]);
       }
     });
     var functionalApp = new Moon({