chore(all): prepare release 1.0.1

aurelia · Jul 29, 2016 · 50c77cc · 50c77cc
1 parent 91287cf
commit 50c77cc
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-binding",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A modern databinding library for JavaScript and HTML.",
   "license": "MIT",
   "keywords": [

diff --git a/dist/amd/aurelia-binding.js b/dist/amd/aurelia-binding.js
@@ -3199,13 +3199,27 @@ define(['exports', 'aurelia-logging', 'aurelia-pal', 'aurelia-task-queue', 'aure
     return event.path && event.path[0] || event.deepPath && event.deepPath[0] || event.target;
   }
 
+  function interceptStopPropagation(event) {
+    event.standardStopPropagation = event.stopPropagation;
+    event.stopPropagation = function () {
+      this.propagationStopped = true;
+      this.standardStopPropagation();
+    };
+  }
+
   function handleDelegatedEvent(event) {
+    var interceptInstalled = false;
+    event.propagationStopped = false;
     var target = findOriginalEventTarget(event);
 
-    while (target) {
+    while (target && !event.propagationStopped) {
       if (target.delegatedCallbacks) {
         var callback = target.delegatedCallbacks[event.type];
         if (callback) {
+          if (!interceptInstalled) {
+            interceptStopPropagation(event);
+            interceptInstalled = true;
+          }
           callback(event);
         }
       }

diff --git a/dist/aurelia-binding.js b/dist/aurelia-binding.js
@@ -3065,13 +3065,27 @@ function findOriginalEventTarget(event) {
   return (event.path && event.path[0]) || (event.deepPath && event.deepPath[0]) || event.target;
 }
 
+function interceptStopPropagation(event) {
+  event.standardStopPropagation = event.stopPropagation;
+  event.stopPropagation = function() {
+    this.propagationStopped  = true;
+    this.standardStopPropagation();
+  };
+}
+
 function handleDelegatedEvent(event) {
+  let interceptInstalled = false;
+  event.propagationStopped = false;
   let target = findOriginalEventTarget(event);
 
-  while (target) {
+  while (target && !event.propagationStopped) {
     if (target.delegatedCallbacks) {
       let callback = target.delegatedCallbacks[event.type];
       if (callback) {
+        if (!interceptInstalled) {
+          interceptStopPropagation(event);
+          interceptInstalled = true;
+        }
         callback(event);
       }
     }

diff --git a/dist/commonjs/aurelia-binding.js b/dist/commonjs/aurelia-binding.js
@@ -3152,13 +3152,27 @@ function findOriginalEventTarget(event) {
   return event.path && event.path[0] || event.deepPath && event.deepPath[0] || event.target;
 }
 
+function interceptStopPropagation(event) {
+  event.standardStopPropagation = event.stopPropagation;
+  event.stopPropagation = function () {
+    this.propagationStopped = true;
+    this.standardStopPropagation();
+  };
+}
+
 function handleDelegatedEvent(event) {
+  var interceptInstalled = false;
+  event.propagationStopped = false;
   var target = findOriginalEventTarget(event);
 
-  while (target) {
+  while (target && !event.propagationStopped) {
     if (target.delegatedCallbacks) {
       var callback = target.delegatedCallbacks[event.type];
       if (callback) {
+        if (!interceptInstalled) {
+          interceptStopPropagation(event);
+          interceptInstalled = true;
+        }
         callback(event);
       }
     }

diff --git a/dist/es2015/aurelia-binding.js b/dist/es2015/aurelia-binding.js
@@ -2909,13 +2909,27 @@ function findOriginalEventTarget(event) {
   return event.path && event.path[0] || event.deepPath && event.deepPath[0] || event.target;
 }
 
+function interceptStopPropagation(event) {
+  event.standardStopPropagation = event.stopPropagation;
+  event.stopPropagation = function () {
+    this.propagationStopped = true;
+    this.standardStopPropagation();
+  };
+}
+
 function handleDelegatedEvent(event) {
+  let interceptInstalled = false;
+  event.propagationStopped = false;
   let target = findOriginalEventTarget(event);
 
-  while (target) {
+  while (target && !event.propagationStopped) {
     if (target.delegatedCallbacks) {
       let callback = target.delegatedCallbacks[event.type];
       if (callback) {
+        if (!interceptInstalled) {
+          interceptStopPropagation(event);
+          interceptInstalled = true;
+        }
         callback(event);
       }
     }

diff --git a/dist/native-modules/aurelia-binding.js b/dist/native-modules/aurelia-binding.js
@@ -3118,13 +3118,27 @@ function findOriginalEventTarget(event) {
   return event.path && event.path[0] || event.deepPath && event.deepPath[0] || event.target;
 }
 
+function interceptStopPropagation(event) {
+  event.standardStopPropagation = event.stopPropagation;
+  event.stopPropagation = function () {
+    this.propagationStopped = true;
+    this.standardStopPropagation();
+  };
+}
+
 function handleDelegatedEvent(event) {
+  var interceptInstalled = false;
+  event.propagationStopped = false;
   var target = findOriginalEventTarget(event);
 
-  while (target) {
+  while (target && !event.propagationStopped) {
     if (target.delegatedCallbacks) {
       var callback = target.delegatedCallbacks[event.type];
       if (callback) {
+        if (!interceptInstalled) {
+          interceptStopPropagation(event);
+          interceptInstalled = true;
+        }
         callback(event);
       }
     }

diff --git a/dist/system/aurelia-binding.js b/dist/system/aurelia-binding.js
@@ -698,13 +698,27 @@ System.register(['aurelia-logging', 'aurelia-pal', 'aurelia-task-queue', 'aureli
     return event.path && event.path[0] || event.deepPath && event.deepPath[0] || event.target;
   }
 
+  function interceptStopPropagation(event) {
+    event.standardStopPropagation = event.stopPropagation;
+    event.stopPropagation = function () {
+      this.propagationStopped = true;
+      this.standardStopPropagation();
+    };
+  }
+
   function handleDelegatedEvent(event) {
+    var interceptInstalled = false;
+    event.propagationStopped = false;
     var target = findOriginalEventTarget(event);
 
-    while (target) {
+    while (target && !event.propagationStopped) {
       if (target.delegatedCallbacks) {
         var callback = target.delegatedCallbacks[event.type];
         if (callback) {
+          if (!interceptInstalled) {
+            interceptStopPropagation(event);
+            interceptInstalled = true;
+          }
           callback(event);
         }
       }

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.0.1"></a>
+## [1.0.1](https://github.com/aurelia/binding/compare/1.0.0...v1.0.1) (2016-07-29)
+
+
+### Features
+
+* **event-manager:** enable stopping propagation of delegated events ([91287cf](https://github.com/aurelia/binding/commit/91287cf)), closes [#467](https://github.com/aurelia/binding/issues/467)
+
+
+
 <a name="1.0.0"></a>
 # [1.0.0](https://github.com/aurelia/binding/compare/1.0.0-rc.1.0.4...v1.0.0) (2016-07-27)
 

diff --git a/doc/example-dist/binding-how-it-works/ast/expression.html b/doc/example-dist/binding-how-it-works/ast/expression.html
@@ -51,7 +51,7 @@
   </style>
   <ul class="expression-tree">
     <div>
-      <span class="expression-type">${value.expression.constructor.name}</span>
+      <span class="expression-type">${type}</span>
       <span class="expression-role">[${value.role}]</span>
       <code class="expression-text">${value.expression}</code>
     </div>

diff --git a/doc/example-dist/binding-how-it-works/ast/expression.js b/doc/example-dist/binding-how-it-works/ast/expression.js
@@ -63,7 +63,7 @@ define(['exports', 'aurelia-framework'], function (exports, _aureliaFramework) {
 
       _initDefineProp(this, 'value', _descriptor, this);
 
-      this.name = '???';
+      this.type = null;
       this.children = null;
     }
 
@@ -72,52 +72,72 @@ define(['exports', 'aurelia-framework'], function (exports, _aureliaFramework) {
       var expression = _ref.expression;
 
       if (expression instanceof _aureliaFramework.AccessThis) {
+        this.type = 'AccessThis';
         this.children = null;
       } else if (expression instanceof _aureliaFramework.AccessScope) {
+        this.type = 'AccessScope';
         this.children = null;
       } else if (expression instanceof _aureliaFramework.AccessMember) {
-        this.children = [{ role: 'object', expression: expression.object }];
+        this.type = 'AccessMember';
+        this.children = [{ role: 'Object', expression: expression.object }];
       } else if (expression instanceof _aureliaFramework.AccessKeyed) {
+        this.type = 'AccessKeyed';
         this.children = [{ role: 'Object', expression: expression.object }, { role: 'Key', expression: expression.key }];
       } else if (expression instanceof _aureliaFramework.Assign) {
+        this.type = 'Assign';
         this.children = [{ role: 'Target', expression: expression.target }, { role: 'Value', expression: expression.value }];
       } else if (expression instanceof _aureliaFramework.Binary) {
+        this.type = 'Binary';
         this.children = [{ role: 'Left', expression: expression.left }, { role: 'Right', expression: expression.right }];
       } else if (expression instanceof _aureliaFramework.BindingBehavior) {
+        this.type = 'BindingBehavior';
         this.children = [{ role: 'Target', expression: expression.expression }].concat(expression.args.map(function (x) {
           return { role: 'Argument', expression: x };
         }));
       } else if (expression instanceof _aureliaFramework.CallFunction) {
+        this.type = 'CallFunction';
         this.children = [{ role: 'Function', expression: expression.func }].concat(expression.args.map(function (x) {
           return { role: 'Argument', expression: x };
         }));
       } else if (expression instanceof _aureliaFramework.CallMember) {
+        this.type = 'CallMember';
         this.children = [{ role: 'Object', expression: expression.object }].concat(expression.args.map(function (x) {
           return { role: 'Argument', expression: x };
         }));
       } else if (expression instanceof _aureliaFramework.CallScope) {
+        this.type = 'CallScope';
         this.children = expression.args.map(function (x) {
           return { role: 'Argument', expression: x };
         });
       } else if (expression instanceof _aureliaFramework.Conditional) {
+        this.type = 'Conditional';
         this.children = [{ role: 'Condition', expression: expression.condition }, { role: 'True-Value', expression: expression.yes }, { role: 'False-Value', expression: expression.no }];
-      } else if (expression instanceof _aureliaFramework.LiteralPrimitive || expression instanceof _aureliaFramework.LiteralString) {
+      } else if (expression instanceof _aureliaFramework.LiteralPrimitive) {
+        this.type = 'LiteralPrimitive';
+        this.children = null;
+      } else if (expression instanceof _aureliaFramework.LiteralString) {
+        this.type = 'LiteralString';
         this.children = null;
       } else if (expression instanceof _aureliaFramework.LiteralArray) {
+        this.type = 'LiteralArray';
         this.children = expression.elements.map(function (x) {
           return { role: 'Element', expression: x };
         });
       } else if (expression instanceof _aureliaFramework.LiteralObject) {
+        this.type = 'LiteralObject';
         this.children = expression.values.map(function (x) {
           return { role: 'Property Value', expression: x };
         });
       } else if (expression instanceof _aureliaFramework.PrefixNot) {
+        this.type = 'PrefixNot';
         this.children = [{ role: 'Target', expression: expression.expression }];
       } else if (expression instanceof _aureliaFramework.ValueConverter) {
+        this.type = 'ValueConverter';
         this.children = [{ role: 'Target', expression: expression.allArgs[0] }].concat(expression.args.map(function (x) {
           return { role: 'Argument', expression: x };
         }));
       } else {
+        this.type = 'Unknown';
         this.children = null;
       }
     };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-binding",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A modern databinding library for JavaScript and HTML.",
   "keywords": [
     "aurelia",