marko 4.24.0 → 4.24.4

package/dist/runtime/components/event-delegation.js

@@ -74,16 +74,6 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
   var listeners = doc[listenersAttachedKey] = doc[listenersAttachedKey] || {};
   if (!listeners[eventType]) {
     body.addEventListener(eventType, listeners[eventType] = function (event) {
-      var propagationStopped = false;
-
-      // Monkey-patch to fix #97
-      var oldStopPropagation = event.stopPropagation;
-
-      event.stopPropagation = function () {
-        oldStopPropagation.call(event);
-        propagationStopped = true;
-      };
-
       var curNode = event.target;
       if (!curNode) {
         return;
@@ -106,15 +96,29 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
       // Attributes will have the following form:
       // on<event_type>("<target_method>|<component_id>")
 
-      do {
-        if (target = getEventFromEl(curNode, propName)) {
-          delegateEvent(curNode, propName, target, event);
+      if (event.bubbles) {
+        var propagationStopped = false;
+
+        // Monkey-patch to fix #97
+        var oldStopPropagation = event.stopPropagation;
 
-          if (propagationStopped) {
-            break;
+        event.stopPropagation = function () {
+          oldStopPropagation.call(event);
+          propagationStopped = true;
+        };
+
+        do {
+          if (target = getEventFromEl(curNode, propName)) {
+            delegateEvent(curNode, propName, target, event);
+
+            if (propagationStopped) {
+              break;
+            }
           }
-        }
-      } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+        } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+      } else if (target = getEventFromEl(curNode, propName)) {
+        delegateEvent(curNode, propName, target, event);
+      }
     }, true);
   }
 }

package/dist/runtime/html/AsyncStream.js

@@ -211,7 +211,7 @@ var proto = AsyncStream.prototype = {
       timeout = AsyncStream.DEFAULT_TIMEOUT;
     }
 
-    newStream._stack = AsyncStream.INCLUDE_STACK ? getNonMarkoStack(new Error()) : null;
+    newStream._stack = AsyncStream.INCLUDE_STACK ? new Error() : null;
     newStream.name = name;
 
     if (timeout > 0) {
@@ -437,6 +437,7 @@ var proto = AsyncStream.prototype = {
   error: function (e) {
     var name = this.name;
     var stack = this._stack;
+    if (stack) stack = getNonMarkoStack(stack);
 
     if (!(e instanceof Error)) {
       e = new Error(JSON.stringify(e));

package/dist/taglib/taglib-finder/index.js

@@ -70,15 +70,15 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    alreadyAdded: function (taglibPath) {
-      return added.hasOwnProperty(taglibPath);
+    alreadyAdded: function (taglibId) {
+      return added.hasOwnProperty(taglibId);
     },
     addTaglib: function (taglib) {
-      if (added[taglib.path]) {
+      if (added[taglib.id]) {
         return;
       }
 
-      added[taglib.path] = true;
+      added[taglib.id] = true;
       found.push(taglib);
     },
     foundTaglibPackages: {}

package/dist/taglib/taglib-lookup/index.js

@@ -37,9 +37,9 @@ function buildLookup(dirname) {
     // The taglibs "closer" to the template will be earlier in the list
     // and the taglibs "farther" from the template will be later. We
     // want closer taglibs to take precedence (especially when de-duping)
-    // so we loop from beginning to end. We used to loop from the end
-    // to the beginning, but that appears to have been a mistake.
-    for (var i = 0; i < taglibs.length; i++) {
+    // so we add the taglibs in reverse order so that "closer" taglibs
+    // merge on top of "farther" ones.
+    for (var i = taglibs.length; i--;) {
       var taglib = taglibs[i];
       lookup.addTaglib(taglib);
       handleImports(lookup, taglib);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.24.0",
+    "version": "4.24.4",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {
@@ -17,7 +17,7 @@
         "estraverse": "^4.3.0",
         "events-light": "^1.0.0",
         "he": "^1.1.0",
-        "htmljs-parser": "^2.11.0",
+        "htmljs-parser": "^2.11.1",
         "lasso-caching-fs": "^1.0.1",
         "lasso-modules-client": "^2.0.4",
         "lasso-package-root": "^1.0.1",

package/src/runtime/components/event-delegation.js

@@ -79,16 +79,6 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
     body.addEventListener(
       eventType,
       (listeners[eventType] = function(event) {
-        var propagationStopped = false;
-
-        // Monkey-patch to fix #97
-        var oldStopPropagation = event.stopPropagation;
-
-        event.stopPropagation = function() {
-          oldStopPropagation.call(event);
-          propagationStopped = true;
-        };
-
         var curNode = event.target;
         if (!curNode) {
           return;
@@ -111,15 +101,29 @@ function addDelegatedEventHandlerToDoc(eventType, doc) {
         // Attributes will have the following form:
         // on<event_type>("<target_method>|<component_id>")
 
-        do {
-          if ((target = getEventFromEl(curNode, propName))) {
-            delegateEvent(curNode, propName, target, event);
+        if (event.bubbles) {
+          var propagationStopped = false;
+
+          // Monkey-patch to fix #97
+          var oldStopPropagation = event.stopPropagation;
 
-            if (propagationStopped) {
-              break;
+          event.stopPropagation = function() {
+            oldStopPropagation.call(event);
+            propagationStopped = true;
+          };
+
+          do {
+            if ((target = getEventFromEl(curNode, propName))) {
+              delegateEvent(curNode, propName, target, event);
+
+              if (propagationStopped) {
+                break;
+              }
             }
-          }
-        } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+          } while ((curNode = curNode.parentNode) && curNode.getAttribute);
+        } else if ((target = getEventFromEl(curNode, propName))) {
+          delegateEvent(curNode, propName, target, event);
+        }
       }),
       true
     );

package/src/runtime/html/AsyncStream.js

@@ -215,9 +215,7 @@ var proto = (AsyncStream.prototype = {
       timeout = AsyncStream.DEFAULT_TIMEOUT;
     }
 
-    newStream._stack = AsyncStream.INCLUDE_STACK
-      ? getNonMarkoStack(new Error())
-      : null;
+    newStream._stack = AsyncStream.INCLUDE_STACK ? new Error() : null;
     newStream.name = name;
 
     if (timeout > 0) {
@@ -451,6 +449,7 @@ var proto = (AsyncStream.prototype = {
   error: function(e) {
     var name = this.name;
     var stack = this._stack;
+    if (stack) stack = getNonMarkoStack(stack);
 
     if (!(e instanceof Error)) {
       e = new Error(JSON.stringify(e));

package/src/taglib/taglib-finder/index.js

@@ -69,15 +69,15 @@ function find(dirname, registeredTaglibs) {
   var added = {};
 
   var helper = {
-    alreadyAdded: function(taglibPath) {
-      return added.hasOwnProperty(taglibPath);
+    alreadyAdded: function(taglibId) {
+      return added.hasOwnProperty(taglibId);
     },
     addTaglib: function(taglib) {
-      if (added[taglib.path]) {
+      if (added[taglib.id]) {
         return;
       }
 
-      added[taglib.path] = true;
+      added[taglib.id] = true;
       found.push(taglib);
     },
     foundTaglibPackages: {}

package/src/taglib/taglib-lookup/index.js

@@ -38,9 +38,9 @@ function buildLookup(dirname) {
     // The taglibs "closer" to the template will be earlier in the list
     // and the taglibs "farther" from the template will be later. We
     // want closer taglibs to take precedence (especially when de-duping)
-    // so we loop from beginning to end. We used to loop from the end
-    // to the beginning, but that appears to have been a mistake.
-    for (var i = 0; i < taglibs.length; i++) {
+    // so we add the taglibs in reverse order so that "closer" taglibs
+    // merge on top of "farther" ones.
+    for (var i = taglibs.length; i--; ) {
       var taglib = taglibs[i];
       lookup.addTaglib(taglib);
       handleImports(lookup, taglib);