jbone - npm Package Compare versions

Comparing version 1.0.20 to 1.0.21

bower.json

 {
   "name": "jbone",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "main": "dist/jbone.js",
@@ -5,0 +5,0 @@ "ignore": [

component.json

@@ -5,3 +5,3 @@ {
   "description": "JavaScript Library for DOM manipulation. Replacement jQuery for Backbone in browsers (2.5kb gzipped)",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "keywords": [
@@ -8,0 +8,0 @@ "jquery",

dist/jbone.js

 /*!
- * jBone v1.0.20 - 2014-11-27 - Library for DOM manipulation
+ * jBone v1.0.21 - 2014-12-12 - Library for DOM manipulation
  *
@@ -39,4 +39,3 @@ * https://github.com/kupriyanenko/jbone
 isFunction = function(el) {
-    var getType = {};
-    return el && getType.toString.call(el) === "[object Function]";
+    return ({}).toString.call(el) === "[object Function]";
 },
@@ -225,16 +224,11 @@ isArray = function(el) {
 jBone.extend = function(target) {
-    var k, kl, i, tg;
+    var tg;
 
-    splice.call(arguments, 1).forEach(function(object) {
-        if (!object) {
-            return;
-        }
-
-        k = keys(object);
-        kl = k.length;
-        i = 0;
+    splice.call(arguments, 1).forEach(function(source) {
         tg = target; //caching target for perf improvement
 
-        for (; i < kl; i++) {
-            tg[k[i]] = object[k[i]];
+        if (source) {
+            for (var prop in source) {
+                tg[prop] = source[prop];
+            }
         }
@@ -315,10 +309,18 @@ });
         i = 0,
-        callback, target, namespace, fn, events, eventType, expectedTarget, addListener;
+        callback = slice.call(args, -1)[0],
+        target, data, namespace, fn, events, eventType, expectedTarget, addListener;
 
-    if (args.length === 2) {
-        callback = args[1];
-    } else {
+    // .on('click', '.selector', function() {})
+    if (args.length === 3 && isString(args[1])) {
         target = args[1];
-        callback = args[2];
     }
+    // .on('click', { key: value }, function() {})
+    else if (args.length === 3 && isObject(args[1])) {
+        data = args[1];
+    }
+    // .on('click', '.selector', { key: value }, function() {})
+    else if (args.length === 4) {
+        target = args[1];
+        data = args[2];
+    }
 
@@ -329,2 +331,8 @@ addListener = function(el) {
         event.split(" ").forEach(function(event) {
+            var eventOptions = {};
+
+            if (data) {
+                eventOptions.data = data;
+            }
+
             eventType = event.split(".")[0];
@@ -340,11 +348,10 @@ namespace = event.split(".").splice(1).join(".");
                 expectedTarget = null;
+
                 if (!target) {
-                    callback.call(el, e);
+                    callback.call(el, new BoneEvent(e, eventOptions));
                 } else if (~jBone(el).find(target).indexOf(e.target) || (expectedTarget = jBone.contains(jBone(el).find(target), e.target))) {
                     expectedTarget = expectedTarget || e.target;
-                    e = new BoneEvent(e, {
-                        currentTarget: expectedTarget
-                    });
+                    eventOptions.currentTarget = expectedTarget;
 
-                    callback.call(expectedTarget, e);
+                    callback.call(expectedTarget, new BoneEvent(e, eventOptions));
                 }
@@ -374,22 +381,16 @@ };
         length = this.length,
-        callback, target, addListener;
+        oneArgs = slice.call(args, 1, args.length - 1),
+        callback = slice.call(args, -1)[0],
+        addListener;
 
-    if (args.length === 2) {
-        callback = args[1];
-    } else {
-        target = args[1], callback = args[2];
-    }
+    addListener = function(el) {
+        var $el =  jBone(el);
 
-    addListener = function(el) {
         event.split(" ").forEach(function(event) {
             var fn = function(e) {
-                jBone(el).off(event, fn);
+                $el.off(event, fn);
                 callback.call(el, e);
             };
 
-            if (!target) {
-                jBone(el).on(event, fn);
-            } else {
-                jBone(el).on(event, target, fn);
-            }
+            $el.on.apply($el, [event].concat(oneArgs, fn));
         });
@@ -396,0 +397,0 @@ };

dist/jbone.min.js

 /*!
- * jBone v1.0.20 - 2014-11-27 - Library for DOM manipulation
+ * jBone v1.0.21 - 2014-12-12 - Library for DOM manipulation
  *
@@ -10,2 +10,2 @@ * https://github.com/kupriyanenko/jbone
 
-!function(a){function b(b){var c=b.length,d=typeof b;return o(d)||b===a?!1:1===b.nodeType&&c?!0:p(d)||0===c||"number"==typeof c&&c>0&&c-1 in b}function c(a,b){var c,d;this.originalEvent=a,d=function(a,b){this[a]="preventDefault"===a?function(){return this.defaultPrevented=!0,b[a]()}:o(b[a])?function(){return b[a]()}:b[a]};for(c in a)(a[c]||"function"==typeof a[c])&&d.call(this,c,a);q.extend(this,b)}var d,e=a.$,f=a.jBone,g=/^<(\w+)\s*\/?>$/,h=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,i=[].slice,j=[].splice,k=Object.keys,l=document,m=function(a){return"string"==typeof a},n=function(a){return a instanceof Object},o=function(a){var b={};return a&&"[object Function]"===b.toString.call(a)},p=function(a){return Array.isArray(a)},q=function(a,b){return new d.init(a,b)};q.noConflict=function(){return a.$=e,a.jBone=f,q},d=q.fn=q.prototype={init:function(a,b){var c,d,e,f;if(!a)return this;if(m(a)){if(d=g.exec(a))return this[0]=l.createElement(d[1]),this.length=1,n(b)&&this.attr(b),this;if((d=h.exec(a))&&d[1]){for(f=l.createDocumentFragment(),e=l.createElement("div"),e.innerHTML=a;e.lastChild;)f.appendChild(e.firstChild);return c=i.call(f.childNodes),q.merge(this,c)}if(q.isElement(b))return q(b).find(a);try{return c=l.querySelectorAll(a),q.merge(this,c)}catch(j){return this}}return a.nodeType?(this[0]=a,this.length=1,this):o(a)?a():a instanceof q?a:q.makeArray(a,this)},pop:[].pop,push:[].push,reverse:[].reverse,shift:[].shift,sort:[].sort,splice:[].splice,slice:[].slice,indexOf:[].indexOf,forEach:[].forEach,unshift:[].unshift,concat:[].concat,join:[].join,every:[].every,some:[].some,filter:[].filter,map:[].map,reduce:[].reduce,reduceRight:[].reduceRight,length:0},d.constructor=q,d.init.prototype=d,q.setId=function(b){var c=b.jid;b===a?c="window":void 0===b.jid&&(b.jid=c=++q._cache.jid),q._cache.events[c]||(q._cache.events[c]={})},q.getData=function(b){b=b instanceof q?b[0]:b;var c=b===a?"window":b.jid;return{jid:c,events:q._cache.events[c]}},q.isElement=function(a){return a&&a instanceof q||a instanceof HTMLElement||m(a)},q._cache={events:{},jid:0},q.merge=function(a,b){for(var c=b.length,d=a.length,e=0;c>e;)a[d++]=b[e++];return a.length=d,a},q.contains=function(a,b){var c;return a.reverse().some(function(a){return a.contains(b)?c=a:void 0}),c},q.extend=function(a){var b,c,d,e;return j.call(arguments,1).forEach(function(f){if(f)for(b=k(f),c=b.length,d=0,e=a;c>d;d++)e[b[d]]=f[b[d]]}),a},q.makeArray=function(a,c){var d=c||[];return null!==a&&(b(a)?q.merge(d,m(a)?[a]:a):d.push(a)),d},q.Event=function(a,b){var c,d;return a.type&&!b&&(b=a,a=a.type),c=a.split(".").splice(1).join("."),d=a.split(".")[0],a=l.createEvent("Event"),a.initEvent(d,!0,!0),q.extend(a,{namespace:c,isDefaultPrevented:function(){return a.defaultPrevented}},b)},d.on=function(a){var b,d,e,f,g,h,i,j,k=arguments,l=this.length,m=0;for(2===k.length?b=k[1]:(d=k[1],b=k[2]),j=function(j){q.setId(j),g=q.getData(j).events,a.split(" ").forEach(function(a){h=a.split(".")[0],e=a.split(".").splice(1).join("."),g[h]=g[h]||[],f=function(a){a.namespace&&a.namespace!==e||(i=null,d?(~q(j).find(d).indexOf(a.target)||(i=q.contains(q(j).find(d),a.target)))&&(i=i||a.target,a=new c(a,{currentTarget:i}),b.call(i,a)):b.call(j,a))},g[h].push({namespace:e,fn:f,originfn:b}),j.addEventListener&&j.addEventListener(h,f,!1)})};l>m;m++)j(this[m]);return this},d.one=function(a){var b,c,d,e=arguments,f=0,g=this.length;for(2===e.length?b=e[1]:(c=e[1],b=e[2]),d=function(d){a.split(" ").forEach(function(a){var e=function(c){q(d).off(a,e),b.call(d,c)};c?q(d).on(a,c,e):q(d).on(a,e)})};g>f;f++)d(this[f]);return this},d.trigger=function(a){var b,c=[],d=0,e=this.length;if(!a)return this;for(m(a)?c=a.split(" ").map(function(a){return q.Event(a)}):(a=a instanceof Event?a:q.Event(a),c=[a]),b=function(a){c.forEach(function(b){b.type&&a.dispatchEvent&&a.dispatchEvent(b)})};e>d;d++)b(this[d]);return this},d.off=function(a,b){var c,d,e,f,g=0,h=this.length,i=function(a,c,d,e,f){var g;(b&&f.originfn===b||!b)&&(g=f.fn),a[c][d].fn===g&&(e.removeEventListener(c,g),q._cache.events[q.getData(e).jid][c].splice(d,1))};for(e=function(b){var e,g,h;return(c=q.getData(b).events)?!a&&c?k(c).forEach(function(a){for(g=c[a],e=g.length;e--;)i(c,a,e,b,g[e])}):void a.split(" ").forEach(function(a){if(f=a.split(".")[0],d=a.split(".").splice(1).join("."),c[f])for(g=c[f],e=g.length;e--;)h=g[e],(!d||d&&h.namespace===d)&&i(c,f,e,b,h);else d&&k(c).forEach(function(a){for(g=c[a],e=g.length;e--;)h=g[e],h.namespace.split(".")[0]===d.split(".")[0]&&i(c,a,e,b,h)})}):void 0};h>g;g++)e(this[g]);return this},d.find=function(a){for(var b=[],c=0,d=this.length,e=function(c){o(c.querySelectorAll)&&[].forEach.call(c.querySelectorAll(a),function(a){b.push(a)})};d>c;c++)e(this[c]);return q(b)},d.get=function(a){return this[a]},d.eq=function(a){return q(this[a])},d.parent=function(){for(var a,b=[],c=0,d=this.length;d>c;c++)!~b.indexOf(a=this[c].parentElement)&&a&&b.push(a);return q(b)},d.toArray=function(){return i.call(this)},d.is=function(){var a=arguments;return this.some(function(b){return b.tagName.toLowerCase()===a[0]})},d.has=function(){var a=arguments;return this.some(function(b){return b.querySelectorAll(a[0]).length})},d.attr=function(a,b){var c,d=arguments,e=0,f=this.length;if(m(a)&&1===d.length)return this[0]&&this[0].getAttribute(a);for(2===d.length?c=function(c){c.setAttribute(a,b)}:n(a)&&(c=function(b){k(a).forEach(function(c){b.setAttribute(c,a[c])})});f>e;e++)c(this[e]);return this},d.removeAttr=function(a){for(var b=0,c=this.length;c>b;b++)this[b].removeAttribute(a);return this},d.val=function(a){var b=0,c=this.length;if(0===arguments.length)return this[0]&&this[0].value;for(;c>b;b++)this[b].value=a;return this},d.css=function(b,c){var d,e=arguments,f=0,g=this.length;if(m(b)&&1===e.length)return this[0]&&a.getComputedStyle(this[0])[b];for(2===e.length?d=function(a){a.style[b]=c}:n(b)&&(d=function(a){k(b).forEach(function(c){a.style[c]=b[c]})});g>f;f++)d(this[f]);return this},d.data=function(a,b){var c,d=arguments,e={},f=0,g=this.length,h=function(a,b,c){n(c)?(a.jdata=a.jdata||{},a.jdata[b]=c):a.dataset[b]=c},i=function(a){return"true"===a?!0:"false"===a?!1:a};if(0===d.length)return this[0].jdata&&(e=this[0].jdata),k(this[0].dataset).forEach(function(a){e[a]=i(this[0].dataset[a])},this),e;if(1===d.length&&m(a))return this[0]&&i(this[0].dataset[a]||this[0].jdata&&this[0].jdata[a]);for(1===d.length&&n(a)?c=function(b){k(a).forEach(function(c){h(b,c,a[c])})}:2===d.length&&(c=function(c){h(c,a,b)});g>f;f++)c(this[f]);return this},d.removeData=function(a){for(var b,c,d=0,e=this.length;e>d;d++)if(b=this[d].jdata,c=this[d].dataset,a)b&&b[a]&&delete b[a],delete c[a];else{for(a in b)delete b[a];for(a in c)delete c[a]}return this},d.html=function(a){var b,c=arguments;return 1===c.length&&void 0!==a?this.empty().append(a):0===c.length&&(b=this[0])?b.innerHTML:this},d.append=function(a){var b,c=0,d=this.length;for(m(a)&&h.exec(a)?a=q(a):n(a)||(a=document.createTextNode(a)),a=a instanceof q?a:q(a),b=function(b,c){a.forEach(function(a){b.appendChild(c?a.cloneNode(!0):a)})};d>c;c++)b(this[c],c);return this},d.appendTo=function(a){return q(a).append(this),this},d.empty=function(){for(var a,b=0,c=this.length;c>b;b++)for(a=this[b];a.lastChild;)a.removeChild(a.lastChild);return this},d.remove=function(){var a,b=0,c=this.length;for(this.off();c>b;b++)a=this[b],delete a.jdata,a.parentNode&&a.parentNode.removeChild(a);return this},"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=q:"function"==typeof define&&define.amd?(define(function(){return q}),a.jBone=a.$=q):"object"==typeof a&&"object"==typeof a.document&&(a.jBone=a.$=q)}(window);
+!function(a){function b(b){var c=b.length,d=typeof b;return o(d)||b===a?!1:1===b.nodeType&&c?!0:p(d)||0===c||"number"==typeof c&&c>0&&c-1 in b}function c(a,b){var c,d;this.originalEvent=a,d=function(a,b){this[a]="preventDefault"===a?function(){return this.defaultPrevented=!0,b[a]()}:o(b[a])?function(){return b[a]()}:b[a]};for(c in a)(a[c]||"function"==typeof a[c])&&d.call(this,c,a);q.extend(this,b)}var d,e=a.$,f=a.jBone,g=/^<(\w+)\s*\/?>$/,h=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,i=[].slice,j=[].splice,k=Object.keys,l=document,m=function(a){return"string"==typeof a},n=function(a){return a instanceof Object},o=function(a){return"[object Function]"==={}.toString.call(a)},p=function(a){return Array.isArray(a)},q=function(a,b){return new d.init(a,b)};q.noConflict=function(){return a.$=e,a.jBone=f,q},d=q.fn=q.prototype={init:function(a,b){var c,d,e,f;if(!a)return this;if(m(a)){if(d=g.exec(a))return this[0]=l.createElement(d[1]),this.length=1,n(b)&&this.attr(b),this;if((d=h.exec(a))&&d[1]){for(f=l.createDocumentFragment(),e=l.createElement("div"),e.innerHTML=a;e.lastChild;)f.appendChild(e.firstChild);return c=i.call(f.childNodes),q.merge(this,c)}if(q.isElement(b))return q(b).find(a);try{return c=l.querySelectorAll(a),q.merge(this,c)}catch(j){return this}}return a.nodeType?(this[0]=a,this.length=1,this):o(a)?a():a instanceof q?a:q.makeArray(a,this)},pop:[].pop,push:[].push,reverse:[].reverse,shift:[].shift,sort:[].sort,splice:[].splice,slice:[].slice,indexOf:[].indexOf,forEach:[].forEach,unshift:[].unshift,concat:[].concat,join:[].join,every:[].every,some:[].some,filter:[].filter,map:[].map,reduce:[].reduce,reduceRight:[].reduceRight,length:0},d.constructor=q,d.init.prototype=d,q.setId=function(b){var c=b.jid;b===a?c="window":void 0===b.jid&&(b.jid=c=++q._cache.jid),q._cache.events[c]||(q._cache.events[c]={})},q.getData=function(b){b=b instanceof q?b[0]:b;var c=b===a?"window":b.jid;return{jid:c,events:q._cache.events[c]}},q.isElement=function(a){return a&&a instanceof q||a instanceof HTMLElement||m(a)},q._cache={events:{},jid:0},q.merge=function(a,b){for(var c=b.length,d=a.length,e=0;c>e;)a[d++]=b[e++];return a.length=d,a},q.contains=function(a,b){var c;return a.reverse().some(function(a){return a.contains(b)?c=a:void 0}),c},q.extend=function(a){var b;return j.call(arguments,1).forEach(function(c){if(b=a,c)for(var d in c)b[d]=c[d]}),a},q.makeArray=function(a,c){var d=c||[];return null!==a&&(b(a)?q.merge(d,m(a)?[a]:a):d.push(a)),d},q.Event=function(a,b){var c,d;return a.type&&!b&&(b=a,a=a.type),c=a.split(".").splice(1).join("."),d=a.split(".")[0],a=l.createEvent("Event"),a.initEvent(d,!0,!0),q.extend(a,{namespace:c,isDefaultPrevented:function(){return a.defaultPrevented}},b)},d.on=function(a){var b,d,e,f,g,h,j,k,l=arguments,o=this.length,p=0,r=i.call(l,-1)[0];for(3===l.length&&m(l[1])?b=l[1]:3===l.length&&n(l[1])?d=l[1]:4===l.length&&(b=l[1],d=l[2]),k=function(i){q.setId(i),g=q.getData(i).events,a.split(" ").forEach(function(a){var k={};d&&(k.data=d),h=a.split(".")[0],e=a.split(".").splice(1).join("."),g[h]=g[h]||[],f=function(a){a.namespace&&a.namespace!==e||(j=null,b?(~q(i).find(b).indexOf(a.target)||(j=q.contains(q(i).find(b),a.target)))&&(j=j||a.target,k.currentTarget=j,r.call(j,new c(a,k))):r.call(i,new c(a,k)))},g[h].push({namespace:e,fn:f,originfn:r}),i.addEventListener&&i.addEventListener(h,f,!1)})};o>p;p++)k(this[p]);return this},d.one=function(a){var b,c=arguments,d=0,e=this.length,f=i.call(c,1,c.length-1),g=i.call(c,-1)[0];for(b=function(b){var c=q(b);a.split(" ").forEach(function(a){var d=function(e){c.off(a,d),g.call(b,e)};c.on.apply(c,[a].concat(f,d))})};e>d;d++)b(this[d]);return this},d.trigger=function(a){var b,c=[],d=0,e=this.length;if(!a)return this;for(m(a)?c=a.split(" ").map(function(a){return q.Event(a)}):(a=a instanceof Event?a:q.Event(a),c=[a]),b=function(a){c.forEach(function(b){b.type&&a.dispatchEvent&&a.dispatchEvent(b)})};e>d;d++)b(this[d]);return this},d.off=function(a,b){var c,d,e,f,g=0,h=this.length,i=function(a,c,d,e,f){var g;(b&&f.originfn===b||!b)&&(g=f.fn),a[c][d].fn===g&&(e.removeEventListener(c,g),q._cache.events[q.getData(e).jid][c].splice(d,1))};for(e=function(b){var e,g,h;return(c=q.getData(b).events)?!a&&c?k(c).forEach(function(a){for(g=c[a],e=g.length;e--;)i(c,a,e,b,g[e])}):void a.split(" ").forEach(function(a){if(f=a.split(".")[0],d=a.split(".").splice(1).join("."),c[f])for(g=c[f],e=g.length;e--;)h=g[e],(!d||d&&h.namespace===d)&&i(c,f,e,b,h);else d&&k(c).forEach(function(a){for(g=c[a],e=g.length;e--;)h=g[e],h.namespace.split(".")[0]===d.split(".")[0]&&i(c,a,e,b,h)})}):void 0};h>g;g++)e(this[g]);return this},d.find=function(a){for(var b=[],c=0,d=this.length,e=function(c){o(c.querySelectorAll)&&[].forEach.call(c.querySelectorAll(a),function(a){b.push(a)})};d>c;c++)e(this[c]);return q(b)},d.get=function(a){return this[a]},d.eq=function(a){return q(this[a])},d.parent=function(){for(var a,b=[],c=0,d=this.length;d>c;c++)!~b.indexOf(a=this[c].parentElement)&&a&&b.push(a);return q(b)},d.toArray=function(){return i.call(this)},d.is=function(){var a=arguments;return this.some(function(b){return b.tagName.toLowerCase()===a[0]})},d.has=function(){var a=arguments;return this.some(function(b){return b.querySelectorAll(a[0]).length})},d.attr=function(a,b){var c,d=arguments,e=0,f=this.length;if(m(a)&&1===d.length)return this[0]&&this[0].getAttribute(a);for(2===d.length?c=function(c){c.setAttribute(a,b)}:n(a)&&(c=function(b){k(a).forEach(function(c){b.setAttribute(c,a[c])})});f>e;e++)c(this[e]);return this},d.removeAttr=function(a){for(var b=0,c=this.length;c>b;b++)this[b].removeAttribute(a);return this},d.val=function(a){var b=0,c=this.length;if(0===arguments.length)return this[0]&&this[0].value;for(;c>b;b++)this[b].value=a;return this},d.css=function(b,c){var d,e=arguments,f=0,g=this.length;if(m(b)&&1===e.length)return this[0]&&a.getComputedStyle(this[0])[b];for(2===e.length?d=function(a){a.style[b]=c}:n(b)&&(d=function(a){k(b).forEach(function(c){a.style[c]=b[c]})});g>f;f++)d(this[f]);return this},d.data=function(a,b){var c,d=arguments,e={},f=0,g=this.length,h=function(a,b,c){n(c)?(a.jdata=a.jdata||{},a.jdata[b]=c):a.dataset[b]=c},i=function(a){return"true"===a?!0:"false"===a?!1:a};if(0===d.length)return this[0].jdata&&(e=this[0].jdata),k(this[0].dataset).forEach(function(a){e[a]=i(this[0].dataset[a])},this),e;if(1===d.length&&m(a))return this[0]&&i(this[0].dataset[a]||this[0].jdata&&this[0].jdata[a]);for(1===d.length&&n(a)?c=function(b){k(a).forEach(function(c){h(b,c,a[c])})}:2===d.length&&(c=function(c){h(c,a,b)});g>f;f++)c(this[f]);return this},d.removeData=function(a){for(var b,c,d=0,e=this.length;e>d;d++)if(b=this[d].jdata,c=this[d].dataset,a)b&&b[a]&&delete b[a],delete c[a];else{for(a in b)delete b[a];for(a in c)delete c[a]}return this},d.html=function(a){var b,c=arguments;return 1===c.length&&void 0!==a?this.empty().append(a):0===c.length&&(b=this[0])?b.innerHTML:this},d.append=function(a){var b,c=0,d=this.length;for(m(a)&&h.exec(a)?a=q(a):n(a)||(a=document.createTextNode(a)),a=a instanceof q?a:q(a),b=function(b,c){a.forEach(function(a){b.appendChild(c?a.cloneNode(!0):a)})};d>c;c++)b(this[c],c);return this},d.appendTo=function(a){return q(a).append(this),this},d.empty=function(){for(var a,b=0,c=this.length;c>b;b++)for(a=this[b];a.lastChild;)a.removeChild(a.lastChild);return this},d.remove=function(){var a,b=0,c=this.length;for(this.off();c>b;b++)a=this[b],delete a.jdata,a.parentNode&&a.parentNode.removeChild(a);return this},"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=q:"function"==typeof define&&define.amd?(define(function(){return q}),a.jBone=a.$=q):"object"==typeof a&&"object"==typeof a.document&&(a.jBone=a.$=q)}(window);

package.json

 {
   "name": "jbone",
   "title": "jBone",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "Library for DOM manipulation",
@@ -6,0 +6,0 @@ "main": "dist/jbone.js",

README.md

@@ -118,2 +118,16 @@ # jBone
 
+## Browser support
+
+Internet Explorer 9+
+
+Safari 6+
+
+iOS 5+ Safari
+
+Android 2.3+ Browser
+
+Chrome
+
+Firefox
+
 ## API
@@ -151,4 +165,4 @@
 
-* [.on(event[, selector], handler)](https://github.com/kupriyanenko/jbone/wiki/Event#onevent-selector-handler)
-* [.one(event[, selector], handler)](https://github.com/kupriyanenko/jbone/wiki/Event#oneevent-selector-handler)
+* [.on(event[, selector, data], handler)](https://github.com/kupriyanenko/jbone/wiki/Event#onevent-selector-data-handler)
+* [.one(event[, selector, data], handler)](https://github.com/kupriyanenko/jbone/wiki/Event#oneevent-selector-data-handler)
 * [.off(event[, handler])](https://github.com/kupriyanenko/jbone/wiki/Event#offevent-handler)
@@ -155,0 +169,0 @@ * [.trigger(event)](https://github.com/kupriyanenko/jbone/wiki/Event#triggerevent)

src/core.js

@@ -28,4 +28,3 @@ var
 isFunction = function(el) {
-    var getType = {};
-    return el && getType.toString.call(el) === "[object Function]";
+    return ({}).toString.call(el) === "[object Function]";
 },
@@ -32,0 +31,0 @@ isArray = function(el) {

src/event.js

@@ -56,10 +56,18 @@ function BoneEvent(e, data) {
         i = 0,
-        callback, target, namespace, fn, events, eventType, expectedTarget, addListener;
+        callback = slice.call(args, -1)[0],
+        target, data, namespace, fn, events, eventType, expectedTarget, addListener;
 
-    if (args.length === 2) {
-        callback = args[1];
-    } else {
+    // .on('click', '.selector', function() {})
+    if (args.length === 3 && isString(args[1])) {
         target = args[1];
-        callback = args[2];
     }
+    // .on('click', { key: value }, function() {})
+    else if (args.length === 3 && isObject(args[1])) {
+        data = args[1];
+    }
+    // .on('click', '.selector', { key: value }, function() {})
+    else if (args.length === 4) {
+        target = args[1];
+        data = args[2];
+    }
 
@@ -70,2 +78,8 @@ addListener = function(el) {
         event.split(" ").forEach(function(event) {
+            var eventOptions = {};
+
+            if (data) {
+                eventOptions.data = data;
+            }
+
             eventType = event.split(".")[0];
@@ -81,11 +95,10 @@ namespace = event.split(".").splice(1).join(".");
                 expectedTarget = null;
+
                 if (!target) {
-                    callback.call(el, e);
+                    callback.call(el, new BoneEvent(e, eventOptions));
                 } else if (~jBone(el).find(target).indexOf(e.target) || (expectedTarget = jBone.contains(jBone(el).find(target), e.target))) {
                     expectedTarget = expectedTarget || e.target;
-                    e = new BoneEvent(e, {
-                        currentTarget: expectedTarget
-                    });
+                    eventOptions.currentTarget = expectedTarget;
 
-                    callback.call(expectedTarget, e);
+                    callback.call(expectedTarget, new BoneEvent(e, eventOptions));
                 }
@@ -115,22 +128,16 @@ };
         length = this.length,
-        callback, target, addListener;
+        oneArgs = slice.call(args, 1, args.length - 1),
+        callback = slice.call(args, -1)[0],
+        addListener;
 
-    if (args.length === 2) {
-        callback = args[1];
-    } else {
-        target = args[1], callback = args[2];
-    }
+    addListener = function(el) {
+        var $el =  jBone(el);
 
-    addListener = function(el) {
         event.split(" ").forEach(function(event) {
             var fn = function(e) {
-                jBone(el).off(event, fn);
+                $el.off(event, fn);
                 callback.call(el, e);
             };
 
-            if (!target) {
-                jBone(el).on(event, fn);
-            } else {
-                jBone(el).on(event, target, fn);
-            }
+            $el.on.apply($el, [event].concat(oneArgs, fn));
         });
@@ -137,0 +144,0 @@ };

src/utilities.js

@@ -44,16 +44,11 @@ function isArraylike(obj) {
 jBone.extend = function(target) {
-    var k, kl, i, tg;
+    var tg;
 
-    splice.call(arguments, 1).forEach(function(object) {
-        if (!object) {
-            return;
-        }
-
-        k = keys(object);
-        kl = k.length;
-        i = 0;
+    splice.call(arguments, 1).forEach(function(source) {
         tg = target; //caching target for perf improvement
 
-        for (; i < kl; i++) {
-            tg[k[i]] = object[k[i]];
+        if (source) {
+            for (var prop in source) {
+                tg[prop] = source[prop];
+            }
         }
@@ -60,0 +55,0 @@ });

test/event.js

@@ -57,5 +57,7 @@ describe('jBone Event', function() {
     it('on(event, callback) with same function', function() {
-        var div = jBone('<div>'), counter = 0, func = function() {
-            counter++;
-        };
+        var div = jBone('<div>'),
+            counter = 0,
+            func = function() {
+                counter++;
+            };
 
@@ -73,2 +75,12 @@ div.on('foo.bar', func).on('foo.zar', func);
 
+    it('on(event, data, callback)', function() {
+        var div = jBone('<div>');
+
+        div.on('foo', {foo: 'bar'}, function(e) {
+            expect(e.data.foo).be.eql('bar');
+        });
+
+        div.trigger('foo');
+    });
+
     it('on(multiple event, callback)', function() {
@@ -111,2 +123,12 @@ var div = jBone('<div>'), counter = 0;
 
+    it('on(event, target, data, callback)', function() {
+        var div = jBone('<div><span></span></div>');
+
+        div.on('foo', 'span', {foo: 'bar'}, function(e) {
+            expect(e.data.foo).be.eql('bar');
+        });
+
+        div.find('span').trigger('foo');
+    });
+
     it('on(event, target, callback) with deep nesting', function() {
@@ -171,2 +193,12 @@ var a = jBone('<div><span class="target"><input type="text" /></span><span class="target"><input type="text" /></span></div>'),
 
+    it('one(event, data, callback)', function() {
+        var div = jBone('<div>');
+
+        div.one('click', {foo: 'bar'}, function(e) {
+            expect(e.data.foo).be.eql('bar');
+        });
+
+        div.trigger('click');
+    });
+
     it('one(event, callback) with recursive call', function() {
@@ -206,2 +238,12 @@ var a = jBone('<div>'), counter = 0;
 
+    it('one(event, target, data, callback)', function() {
+        var div = jBone('<div><span></span></div>');
+
+        div.one('foo', 'span', {foo: 'bar'}, function(e) {
+            expect(e.data.foo).be.eql('bar');
+        });
+
+        div.find('span').trigger('foo');
+    });
+
     it('one(event.namespace, callback)', function() {
@@ -208,0 +250,0 @@ var div = jBone('<div>'),

No alert changes

Improved metrics

Total package byte prevSize

636467

increased by0.27%

Lines of code

17949

increased by0.16%

Number of lines in readme file

224

increased by6.67%

No dependency changes