Fixed bug related to live event binding and other small fixes

nsisodiya · Feb 8, 2015 · d4ffc1e · d4ffc1e
1 parent abdad15
commit d4ffc1e
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 24 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -9,6 +9,14 @@ Latest Release
 Older releases
 =============
 
+* 1.3.9 - on 8 Feb, 2015
+
+Fixed bug on event binding and Live events
+
+* 1.3.8 - on 4 Jan, 2015
+
+Fixed bug : multiple subViews was not loading !
+
 * 1.3.4 - on 1 Jan 2015
 
 Now, Id will be generated automatically. You need now to pass id when loading any AppView or subView

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "choona.js",
   "repo": "nsisodiya/choona.js",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "main": "dist/choona.js",
   "keywords": [
     "scalable",

diff --git a/dist/choona.js b/dist/choona.js
@@ -1,8 +1,8 @@
 /**
- * Copyright 2013-14 Narendra Sisodiya, <[email protected]>
+ * Copyright 2013-15 Narendra Sisodiya, <[email protected]>
  * Licensed under "The MIT License". visit http://nsisodiya.mit-license.org/ to read the License.
  * @author Narendra Sisodiya
- *
+ * Version - 1.3.9
  */
  ;var choona = {};
 (function() {
@@ -22,7 +22,7 @@
     Child.prototype = Object.create(Parent.prototype);
     Child.prototype.constructor = Child;
     for (var i in ChildProto) {
-      if (ChildProto.hasOwnProperty(i)) {
+      if (ChildProto.hasOwnProperty(i) === true) {
         Child.prototype[i] = ChildProto[i];
       }
     }
@@ -136,7 +136,7 @@
     //Replacement for _.each over Objects
     for: function(Obj, callback) {
       for (var i in Obj) {
-        if (Obj.hasOwnProperty(i)) {
+        if (Obj.hasOwnProperty(i) === true) {
           callback(Obj[i], i);
         }
       }
@@ -291,7 +291,7 @@
         topicList: {},
         subModuleList: {},
         id: moduleConf.id,
-        eventsMap: [],
+        eventsMap: {},
         mercykillFunc: null
       };
 
@@ -308,7 +308,7 @@
       }
 
       //setup this.$el & this.$$ if jQuery present.
-      if (window.jQuery) {
+      if (window.jQuery !== undefined && typeof window.jQuery === "function") {
         this.$el = this.$$ = window.jQuery(this.$);
       }
 
@@ -328,7 +328,8 @@
        * because, you need to get event bus for
        * */
 
-      //Start Isolated EventBus , this will be useful for creating third party widget who do not want to create conflicts in naming
+      //Start Isolated EventBus , this will be useful for creating third party widget who do not want to create
+      // conflicts in naming
       if (this.isolatedEventBus === true) {
         this._viewMetadata.eventBus = new choona.EventBus();
       }
@@ -434,10 +435,16 @@
 
         var callback = function(e) {
           if (hash === "") {
-            self[handler].call(self, e, e.target, e.target.dataset);
+            self[handler].call(self, e, e.currentTarget, e.currentTarget.dataset);
           } else {
-            if (e.target.matches(hash)) {
-              self[handler].call(self, e, e.target, e.target.dataset);
+            var currNode;
+            currNode = e.target;
+            while (currNode !== e.currentTarget && currNode !== document) {
+              if (currNode.matches(hash) === true) {
+                self[handler].call(self, e, currNode, currNode.dataset);
+                break;
+              }
+              currNode = currNode.parentNode;
             }
           }
         };
@@ -478,7 +485,7 @@
       }
 
       //unSubscribing All DOM events
-      this._viewMetadata.eventsMap.map(function(v, key) {
+      choona.Util.for(this._viewMetadata.eventsMap, function(v, key) {
         self.off(key);
       });
 
@@ -501,6 +508,9 @@
       delete this._viewMetadata.topicList;
       delete this._viewMetadata.eventsMap;
       delete this._viewMetadata;
+      choona.Util.for(this, function(v, key) {
+        delete self[key];
+      });
     }
   });
 

diff --git a/dist/choona.min.js b/dist/choona.min.js
diff --git a/src/choona.Klass.js b/src/choona.Klass.js
@@ -16,7 +16,7 @@ var choona = {};
     Child.prototype = Object.create(Parent.prototype);
     Child.prototype.constructor = Child;
     for (var i in ChildProto) {
-      if (ChildProto.hasOwnProperty(i)) {
+      if (ChildProto.hasOwnProperty(i) === true) {
         Child.prototype[i] = ChildProto[i];
       }
     }

diff --git a/src/choona.Util.js b/src/choona.Util.js
@@ -45,7 +45,7 @@
     //Replacement for _.each over Objects
     for: function(Obj, callback) {
       for (var i in Obj) {
-        if (Obj.hasOwnProperty(i)) {
+        if (Obj.hasOwnProperty(i) === true) {
           callback(Obj[i], i);
         }
       }

diff --git a/src/choona.View.js b/src/choona.View.js
@@ -28,7 +28,7 @@
         topicList: {},
         subModuleList: {},
         id: moduleConf.id,
-        eventsMap: [],
+        eventsMap: {},
         mercykillFunc: null
       };
 
@@ -45,7 +45,7 @@
       }
 
       //setup this.$el & this.$$ if jQuery present.
-      if (window.jQuery) {
+      if (window.jQuery !== undefined && typeof window.jQuery === "function") {
         this.$el = this.$$ = window.jQuery(this.$);
       }
 
@@ -65,7 +65,8 @@
        * because, you need to get event bus for
        * */
 
-      //Start Isolated EventBus , this will be useful for creating third party widget who do not want to create conflicts in naming
+      //Start Isolated EventBus , this will be useful for creating third party widget who do not want to create
+      // conflicts in naming
       if (this.isolatedEventBus === true) {
         this._viewMetadata.eventBus = new choona.EventBus();
       }
@@ -171,10 +172,16 @@
 
         var callback = function(e) {
           if (hash === "") {
-            self[handler].call(self, e, e.target, e.target.dataset);
+            self[handler].call(self, e, e.currentTarget, e.currentTarget.dataset);
           } else {
-            if (e.target.matches(hash)) {
-              self[handler].call(self, e, e.target, e.target.dataset);
+            var currNode;
+            currNode = e.target;
+            while (currNode !== e.currentTarget && currNode !== document) {
+              if (currNode.matches(hash) === true) {
+                self[handler].call(self, e, currNode, currNode.dataset);
+                break;
+              }
+              currNode = currNode.parentNode;
             }
           }
         };
@@ -215,7 +222,7 @@
       }
 
       //unSubscribing All DOM events
-      this._viewMetadata.eventsMap.map(function(v, key) {
+      choona.Util.for(this._viewMetadata.eventsMap, function(v, key) {
         self.off(key);
       });
 
@@ -238,6 +245,9 @@
       delete this._viewMetadata.topicList;
       delete this._viewMetadata.eventsMap;
       delete this._viewMetadata;
+      choona.Util.for(this, function(v, key) {
+        delete self[key];
+      });
     }
   });
 

diff --git a/src/headerNotice.md b/src/headerNotice.md
@@ -1,7 +1,7 @@
 /**
- * Copyright 2013-14 Narendra Sisodiya, <[email protected]>
+ * Copyright 2013-15 Narendra Sisodiya, <[email protected]>
  * Licensed under "The MIT License". visit http://nsisodiya.mit-license.org/ to read the License.
  * @author Narendra Sisodiya
- *
+ * Version - 1.3.9
  */