1.0.28

kupriyanenko · Apr 16, 2015 · 20899a6 · 20899a6
1 parent 15a23a9
commit 20899a6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jbone",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "main": "dist/jbone.js",
   "ignore": [
     "**/.*",

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
   "name": "jbone",
   "repo": "kupriyanenko/jbone",
   "description": "JavaScript Library for DOM manipulation. Replacement jQuery for Backbone in browsers (2.5kb gzipped)",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "keywords": [
     "jquery",
     "jbone",

diff --git a/dist/jbone.js b/dist/jbone.js
@@ -1,5 +1,5 @@
 /*!
- * jBone v1.0.27 - 2015-04-14 - Library for DOM manipulation
+ * jBone v1.0.28 - 2015-04-17 - Library for DOM manipulation
  *
  * https://github.com/kupriyanenko/jbone
  *
@@ -385,6 +385,7 @@ jBone.event = {
             // if propagation is not stopped
             !(event && event.isImmediatePropagationStopped());
         i++) {
+            expectedTarget = null;
             eventOptions = {};
             handler = handlerQueue[i];
             handler.data && (eventOptions.data = handler.data);
@@ -400,20 +401,26 @@ jBone.event = {
             // event handler with selector
             else if (
                 // if target and selected element the same
-                ~(targets = jBone(el).find(handler.selector)).indexOf(e.target) ||
+                ~(targets = jBone(el).find(handler.selector)).indexOf(e.target) && (expectedTarget = e.target) ||
                 // if one of element matched with selector contains target
                 (el !== e.target && el.contains(e.target))
             ) {
-                l = targets.length;
-
                 // get element matched with selector
-                for (; j < length; j++) {
-                    if (targets[j] && targets[j].contains(e.target)) {
-                        expectedTarget = targets[j];
+                if (!expectedTarget) {
+                    l = targets.length;
+                    j = 0;
+
+                    for (; j < l; j++) {
+                        if (targets[j] && targets[j].contains(e.target)) {
+                            expectedTarget = targets[j];
+                        }
                     }
                 }
 
-                expectedTarget = expectedTarget || e.target;
+                if (!expectedTarget) {
+                    continue;
+                }
+
                 eventOptions.currentTarget = expectedTarget;
                 event = new BoneEvent(e, eventOptions);