Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use expand() not mixin()

  • Loading branch information...
commit 41db0eaeb768f002b61b32e42901e79ef600b120 1 parent 9e2a5da
@ryanve authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  dj.js
  2. +5 −5 dj.min.js
View
2  dj.js
@@ -373,7 +373,7 @@
}
};
- mixin(dj, methods, true);
+ expand(dj, methods, true);
// set the hook and return `dj`
return hook('dj', dj);
View
10 dj.min.js
@@ -1,7 +1,7 @@
/*! dj 0.7.0 | @link github.com/ryanve/dj | @author ryanve | @license MIT */
(function(l,g,m){"undefined"!=typeof module&&module.exports?module.exports=m():l[g]=l[g]||m()})(this,"dj",function(){function l(a){if(a&&!("object"!=typeof a||0<a.nodeType||a===window))if("number"==typeof(a=a.length)&&a===a)return a}function g(a,d){return new m(a,d)}function m(a,d){var c;this.length=0;"string"==typeof a&&(a=n("select")(this.selector=a,d));if(null==a)return this;if("function"==typeof a)n("closure")(a,d);else if(null==(c=l(a)))this[this.length++]=a;else for(this.length=c=0<c?c>>0:0;c--;)this[c]=
-a[c]}function v(a,d,c,e){var b;if(null==a)throw new TypeError("@expand");if(null==d)return a;c=!0===c;e=!0===e?t:e;for(b in d)if(c||null==a[b]&&null!=d[b])if(!e||e.call(d,b))a[b]=d[b];return a}function w(a,d,c){if(!q(this))throw new TypeError("@mixin");return v(this,a,d,!1!==c)}function r(a,d,c){var e,b,f;if(a&&q(this)){d=!0===d;c="function"==typeof c||"object"==typeof c?c:a;for(b in this)if(e=this[b],"function"==typeof e||"object"==typeof e&&e)if("fn"===b&&e!==this)r.call(e,a[b],d,c);else if(d?a[b]!==
-a&&a[b]!==c:null==a[b])f=e.relay,"function"==typeof f&&(f=f.call(e,c,a[b])),!1!==f&&(a[b]=f||e);return a}}function x(){function a(b,f){var j,g,h;b="function"==typeof b?b.call(this,a()):b;if("string"==typeof b||"number"==typeof b){if(void 0===f)return c[b];e&&("function"==typeof f||"object"==typeof f&&"function"!=typeof d[b]?f&&!1!==e[b]&&(c[b]=f,d[b]=d[b]||f):!1===f?e[b]=f:!0===f&&(c[b]=d[b]));return null===f?!1!==e[b]:q(this)||c[b]}if("boolean"==typeof b){if(b){if(e)for(j in c=k(null),d)c[j]=d[j]}else e=
-d=null;b=void 0}if(void 0===b){g=k(null);for(j in c)g[j]=c[j];return g}if(null===b)return!!e;if(e)for(j in h="string"==typeof f?f:"",g="boolean"==typeof f,b)a(h+j,b[j]),g&&a(h+j,f);return q(this)||void 0}var d=k(null),c=k(null),e=k(null);a.remix=x;return a}var n,y=Object.prototype,t=y.hasOwnProperty,q=function(){var a=this||window;return function(d){return null==d||d===a?0:d}}(),s;var p=Object,u=function(){},h;u.k="object";try{h=p.create(null),s=!h||h.toString||null!==p.getPrototypeOf(h)||!p.create([]).pop||
-!(h=p.create(u))?!1:typeof h===h.k&&p.getPrototypeOf(h)===u}catch(A){s=!1}var z=s&&Object.getPrototypeOf||function(a){return void 0!==a.__proto__?a.__proto__:a.constructor?a.constructor.prototype:y},k=s&&Object.create||function(a){function d(){}var c;if(null===a)return{__proto__:null};d.prototype=a;c=new d;c.__proto__=a;return c};g.prototype=g.fn=m.prototype={};g.fn.$=g;r.relay=!0;n=x();w(g,{hook:n,owns:t,pro:z,count:l,nu:k,bridge:r,resample:function(a,d){var c,e;if(!0===a||!arguments.length)a=this;
-void 0===d&&(d=z(a));e=k(d);for(c in a){if(!t.call(a,c))break;e[c]=a[c]}return e},expand:v,mixin:w,submix:function(a,d){return r.call(a,this,d)}},!0);return n("dj",g)});
+a[c]}function t(a,d,c,e){var b;if(null==a)throw new TypeError("@expand");if(null==d)return a;c=!0===c;e=!0===e?u:e;for(b in d)if(c||null==a[b]&&null!=d[b])if(!e||e.call(d,b))a[b]=d[b];return a}function q(a,d,c){var e,b,f;if(a&&r(this)){d=!0===d;c="function"==typeof c||"object"==typeof c?c:a;for(b in this)if(e=this[b],"function"==typeof e||"object"==typeof e&&e)if("fn"===b&&e!==this)q.call(e,a[b],d,c);else if(d?a[b]!==a&&a[b]!==c:null==a[b])f=e.relay,"function"==typeof f&&(f=f.call(e,c,a[b])),!1!==
+f&&(a[b]=f||e);return a}}function w(){function a(b,f){var j,g,h;b="function"==typeof b?b.call(this,a()):b;if("string"==typeof b||"number"==typeof b){if(void 0===f)return c[b];e&&("function"==typeof f||"object"==typeof f&&"function"!=typeof d[b]?f&&!1!==e[b]&&(c[b]=f,d[b]=d[b]||f):!1===f?e[b]=f:!0===f&&(c[b]=d[b]));return null===f?!1!==e[b]:r(this)||c[b]}if("boolean"==typeof b){if(b){if(e)for(j in c=k(null),d)c[j]=d[j]}else e=d=null;b=void 0}if(void 0===b){g=k(null);for(j in c)g[j]=c[j];return g}if(null===
+b)return!!e;if(e)for(j in h="string"==typeof f?f:"",g="boolean"==typeof f,b)a(h+j,b[j]),g&&a(h+j,f);return r(this)||void 0}var d=k(null),c=k(null),e=k(null);a.remix=w;return a}var n,x=Object.prototype,u=x.hasOwnProperty,r=function(){var a=this||window;return function(d){return null==d||d===a?0:d}}(),s;var p=Object,v=function(){},h;v.k="object";try{h=p.create(null),s=!h||h.toString||null!==p.getPrototypeOf(h)||!p.create([]).pop||!(h=p.create(v))?!1:typeof h===h.k&&p.getPrototypeOf(h)===v}catch(z){s=
+!1}var y=s&&Object.getPrototypeOf||function(a){return void 0!==a.__proto__?a.__proto__:a.constructor?a.constructor.prototype:x},k=s&&Object.create||function(a){function d(){}var c;if(null===a)return{__proto__:null};d.prototype=a;c=new d;c.__proto__=a;return c};g.prototype=g.fn=m.prototype={};g.fn.$=g;q.relay=!0;n=w();t(g,{hook:n,owns:u,pro:y,count:l,nu:k,bridge:q,resample:function(a,d){var c,e;if(!0===a||!arguments.length)a=this;void 0===d&&(d=y(a));e=k(d);for(c in a){if(!u.call(a,c))break;e[c]=a[c]}return e},
+expand:t,mixin:function(a,d,c){if(!r(this))throw new TypeError("@mixin");return t(this,a,d,!1!==c)},submix:function(a,d){return q.call(a,this,d)}},!0);return n("dj",g)});
Please sign in to comment.
Something went wrong with that request. Please try again.