rasti 2.0.0-alpha.4 → 2.0.0-alpha.6

package/src/View.js

@@ -62,7 +62,7 @@ export default class View extends Emitter {
         // Useful to generate elements ids.
         this.uid = `uid${++View.uid}`;
         // Store delegated events listeners,
-        // so they can be unbinded later.
+        // so they can be unbound later.
         this.delegatedEventListeners = [];
         // Store child views,
         // so they can be destroyed.
@@ -104,25 +104,24 @@ export default class View extends Emitter {
     /**
      * Destroy the view.
      * Destroy children views if any, undelegate events, stop listening to events, call `onDestroy` lifecycle method.
-     * Pass options.remove as true to remove the view's root element (`this.el`) from the DOM.
-     * @param {object} options.remove Remove the view's root element (`this.el`) from the DOM.
      */
-    destroy({ remove } = {}) {
+    destroy() {
         // Call destroy on children.
         this.destroyChildren();
         // Undelegate `this.el` event listeners
         this.undelegateEvents();
         // Unbind `this` events.
         this.off();
-        // Remove `this.el` if "options.remove" is true.
-        if (remove) this.removeElement();
         // Call onDestroy lifecycle method
         this.onDestroy.apply(this, arguments);
+        // Return `this` for chaining.
+        return this;
     }
 
     /**
      * `onDestroy` lifecycle method is called after view is destroyed.
      * Override with your code. Useful to stop listening to model's events.
+     * @param {object} options Options object or any arguments passed to `destroy` method.
      */
     onDestroy() {}
 
@@ -211,13 +210,15 @@ export default class View extends Emitter {
         let eventTypes = {};
 
         Object.keys(events).forEach(key => {
-            let keyParts = key.split(' '),
-                type = keyParts.shift(),
-                selector = keyParts.join(' '),
-                listener = events[key];
+            const keyParts = key.split(' ');
+            const type = keyParts.shift();
+            const selector = keyParts.join(' ');
 
+            let listener = events[key];
+            // Listener may be a string representing a method name on the view,
+            // or a function.
             listener = (
-                typeof listener === 'string' ?  
+                typeof listener === 'string' ?
                     this[listener] : 
                     listener
             ).bind(this);
@@ -227,22 +228,19 @@ export default class View extends Emitter {
             eventTypes[type].push({ selector, listener });
         });
 
-        const indexOf = Array.prototype.indexOf;
-
         Object.keys(eventTypes).forEach(type => {
-            let self = this;
-            let typeListener = function (event) {
-                eventTypes[type].forEach(function ({ selector, listener }) {
-                    if (indexOf.call(selector ? self.el.querySelectorAll(selector) : [self.el], event.target) > -1) {
-                        listener(event, self);
-                    }
+            // Listener for the type of event.
+            const typeListener = (event) => {
+                // Iterate and run every individual listener if the selector matches.
+                eventTypes[type].forEach(({ selector, listener }) => {
+                    if (!selector || event.target.closest(selector)) listener(event, this);
                 });
             };
 
             this.delegatedEventListeners.push({ type, listener : typeListener });
             this.el.addEventListener(type, typeListener);
         });
-
+        // Return `this` for chaining.
         return this;
     }
 
@@ -256,7 +254,7 @@ export default class View extends Emitter {
         });
 
         this.delegatedEventListeners = [];
-
+        // Return `this` for chaining.
         return this;
     }
 
@@ -271,6 +269,7 @@ export default class View extends Emitter {
      */
     render() {
         if (this.template) this.el.innerHTML = this.template(this.model);
+        // Return `this` for chaining.
         return this;
     }
 }