stump-cycle-dom - npm Package Compare versions

Comparing version 0.0.13 to 0.0.14

lib/cjs/EventDelegator.js

@@ -91,2 +91,3 @@ "use strict";
     EventDelegator.prototype.addEventListener = function (eventType, namespace, options, bubbles) {
+        var _this = this;
         var subject = xstream_1.default.never();
@@ -106,22 +107,21 @@ var dest;
         else {
-            var found = this.nonBubblingListenersToAdd.find(function (x) {
+            var input_1 = this.nonBubblingListenersToAdd.find(function (x) {
                 var _sub = x[0], et = x[1], ef = x[2], _ = x[3];
                 return eventType === et && utils_1.isEqualNamespace(ef.namespace, namespace);
             });
-            if (!found) {
-                var self_1 = this;
+            var non_bubble_subject = void 0;
+            if (!input_1) {
                 var finder = new ElementFinder_1.ElementFinder(namespace, this.isolateModule);
-                var input_1;
-                subject = subject.compose(whenComplete_1.default(function () {
-                    self_1.nonBubblingListenersToAdd.delete(input_1);
-                }));
                 dest = this.insertListener(subject, scopeChecker, eventType, options);
                 input_1 = [subject, eventType, finder, dest];
                 this.setupNonBubblingListener(input_1);
-                return subject;
+                non_bubble_subject = subject;
             }
             else {
-                var sub = found[0];
-                return sub;
+                var sub = input_1[0];
+                non_bubble_subject = sub;
             }
+            return non_bubble_subject.compose(whenComplete_1.default(function () {
+                _this.nonBubblingListenersToAdd.delete(input_1);
+            }));
         }
@@ -218,3 +218,3 @@ };
         if (elements.length) {
-            var self_2 = this;
+            var self_1 = this;
             elements.forEach(function (element) {
@@ -226,3 +226,3 @@ var _a;
                         next: function (ev) {
-                            return self_2.onEvent(eventType, ev, !!destination.passive, false);
+                            return self_1.onEvent(eventType, ev, !!destination.passive, false);
                         },
@@ -232,6 +232,6 @@ error: function () { },
                     });
-                    if (!self_2.nonBubblingListeners.has(eventType)) {
-                        self_2.nonBubblingListeners.set(eventType, new Map());
+                    if (!self_1.nonBubblingListeners.has(eventType)) {
+                        self_1.nonBubblingListeners.set(eventType, new Map());
                     }
-                    var map = self_2.nonBubblingListeners.get(eventType);
+                    var map = self_1.nonBubblingListeners.get(eventType);
                     if (!map) {
@@ -238,0 +238,0 @@ return;

lib/es6/EventDelegator.js

@@ -89,2 +89,3 @@ var __assign = (this && this.__assign) || function () {
     EventDelegator.prototype.addEventListener = function (eventType, namespace, options, bubbles) {
+        var _this = this;
         var subject = xs.never();
@@ -104,22 +105,21 @@ var dest;
         else {
-            var found = this.nonBubblingListenersToAdd.find(function (x) {
+            var input_1 = this.nonBubblingListenersToAdd.find(function (x) {
                 var _sub = x[0], et = x[1], ef = x[2], _ = x[3];
                 return eventType === et && isEqualNamespace(ef.namespace, namespace);
             });
-            if (!found) {
-                var self_1 = this;
+            var non_bubble_subject = void 0;
+            if (!input_1) {
                 var finder = new ElementFinder(namespace, this.isolateModule);
-                var input_1;
-                subject = subject.compose(whenComplete(function () {
-                    self_1.nonBubblingListenersToAdd.delete(input_1);
-                }));
                 dest = this.insertListener(subject, scopeChecker, eventType, options);
                 input_1 = [subject, eventType, finder, dest];
                 this.setupNonBubblingListener(input_1);
-                return subject;
+                non_bubble_subject = subject;
             }
             else {
-                var sub = found[0];
-                return sub;
+                var sub = input_1[0];
+                non_bubble_subject = sub;
             }
+            return non_bubble_subject.compose(whenComplete(function () {
+                _this.nonBubblingListenersToAdd.delete(input_1);
+            }));
         }
@@ -216,3 +216,3 @@ };
         if (elements.length) {
-            var self_2 = this;
+            var self_1 = this;
             elements.forEach(function (element) {
@@ -224,3 +224,3 @@ var _a;
                         next: function (ev) {
-                            return self_2.onEvent(eventType, ev, !!destination.passive, false);
+                            return self_1.onEvent(eventType, ev, !!destination.passive, false);
                         },
@@ -230,6 +230,6 @@ error: function () { },
                     });
-                    if (!self_2.nonBubblingListeners.has(eventType)) {
-                        self_2.nonBubblingListeners.set(eventType, new Map());
+                    if (!self_1.nonBubblingListeners.has(eventType)) {
+                        self_1.nonBubblingListeners.set(eventType, new Map());
                     }
-                    var map = self_2.nonBubblingListeners.get(eventType);
+                    var map = self_1.nonBubblingListeners.get(eventType);
                     if (!map) {
@@ -236,0 +236,0 @@ return;

package.json

 {
   "name": "stump-cycle-dom",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "The standard DOM Driver for Cycle.js, based on Snabbdom",
@@ -5,0 +5,0 @@ "license": "MIT",

src/EventDelegator.ts

@@ -152,3 +152,3 @@ import xs, {Stream, Subscription} from 'xstream';
     } else {
-      const found = this.nonBubblingListenersToAdd.find(x => {
+      let input = this.nonBubblingListenersToAdd.find(x => {
         const [_sub, et, ef, _] = x
@@ -158,10 +158,5 @@ return eventType === et && isEqualNamespace(ef.namespace, namespace)
       
-      if (!found) {
-        const self = this
+      let non_bubble_subject: Stream<Event>
+      if (!input) {
         const finder = new ElementFinder(namespace, this.isolateModule);
-        let input: any
-        subject = subject.compose(whenComplete(() => { 
-          self.nonBubblingListenersToAdd.delete(input); 
-        }))
-
         dest = this.insertListener(subject, scopeChecker, eventType, options);
@@ -172,7 +167,11 @@ input = [subject, eventType, finder, dest];
 
-        return subject
+        non_bubble_subject = subject
       } else {
-        const [sub] = found
-        return sub
+        const [sub] = input
+        non_bubble_subject = sub
       }
+
+      return non_bubble_subject.compose(whenComplete(() => { 
+        this.nonBubblingListenersToAdd.delete(input as any); 
+      }))
     }
@@ -179,0 +178,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

538524

increased by0.02%

Worsened metrics

Lines of code

12188

decreased by-0.01%

No dependency changes