Permalink
Browse files

meant to true that

  • Loading branch information...
1 parent 254d152 commit b284746ccb71e4da8e2fb87a8d7aac032b191fe6 @ryanve committed Sep 3, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 hook.js
  2. +2 −2 hook.min.js
View
@@ -130,7 +130,7 @@
*/
function mixin ( supplier, force ) {
if ( !gnd(this) ) { throw new TypeError('@mixin'); }
- return expand(this, supplier, force);
+ return expand(this, supplier, force, true);
}
/**
View
@@ -2,5 +2,5 @@
(function(i,h,k){"undefined"!=typeof module&&module.exports?module.exports=k():i[h]=i[h]||k()})(this,"hook",function(){function i(a,e,d,c){var b;if(null==a)throw new TypeError("@expand");if(null==e)return a;d=!0===d;c=!0===c?m:c;for(b in e)if(d||null==a[b]&&null!=e[b])if(!c||c.call(e,b))a[b]=e[b];return a}function h(a,e,d){var c,b,g;if(null!=a&&l(this)){e=!0===e;d="function"==typeof d||"object"==typeof d&&d?d:a;for(b in this)if(c=this[b],"function"==typeof c||"object"==typeof c&&c)if("fn"===b&&c!==
this)h.call(c,a[b],e,d);else if(e?a[b]!==a&&a[b]!==d:null==a[b])g=c.relay,"function"==typeof g&&(g=g.call(c,d,a[b])),!1!==g&&(a[b]=typeof g==typeof c?g||c:c);return a}}function k(){function a(b,g){var f,h,i,b="function"==typeof b?b.call(this,a()):b;if("string"==typeof b||"number"==typeof b){if(void 0===g)return d[b];c&&("function"==typeof g?!1!==c[b]&&(d[b]=g,e[b]=e[b]||g):!1===g?c[b]=g:!0===g&&(d[b]=e[b]));return null===g?!1!==c[b]:l(this)||d[b]}if("boolean"==typeof b){if(b){if(c)for(f in d=j(null),
e)d[f]=e[f]}else c=e=null;b=void 0}if(void 0===b){h=j(null);for(f in d)h[f]=d[f];return h}if(null===b)return!!c;if(c)for(f in i="string"==typeof g?g:"",h="boolean"==typeof g,b)a(i+f,b[f]),h&&a(i+f,g);return l(this)||void 0}var e=j(null),d=j(null),c=j(null);a.remix=k;return a}var f,p=this||window,n=Object.prototype,m=n.hasOwnProperty,l=function(a){return null==a||a===p?0:a},o=(f=function(a){function e(){}var d,c;e.k=1;try{c=a.create(null);for(d in c)return!1;if(null!==a.getPrototypeOf(c))return!1;
-c=a.create(e);return!!c&&1===c.k}catch(b){return!1}}(Object))&&Object.getPrototypeOf||function(a){return void 0!==a.__proto__?a.__proto__:a.constructor?a.constructor.prototype:n},j=f&&Object.create||function(a){function e(){}var d;if(null===a)return{__proto__:null};e.prototype=a;d=new e;d.__proto__=a;return d};h.relay=!0;f=k();f.hook=f;f.bridge=h;f.pro=o;f.nu=j;f.mixin=function(a,e){if(!l(this))throw new TypeError("@mixin");return i(this,a,e)};f.owns=m;f.resample=function(a,e){var d,c;if(!0===a||
-!arguments.length)a=this;void 0===e&&(e=o(a));c=j(e);for(d in a){if(!m.call(a,d))break;c[d]=a[d]}return c};f.expand=i;return f});
+c=a.create(e);return!!c&&1===c.k}catch(b){return!1}}(Object))&&Object.getPrototypeOf||function(a){return void 0!==a.__proto__?a.__proto__:a.constructor?a.constructor.prototype:n},j=f&&Object.create||function(a){function e(){}var d;if(null===a)return{__proto__:null};e.prototype=a;d=new e;d.__proto__=a;return d};h.relay=!0;f=k();f.hook=f;f.bridge=h;f.pro=o;f.nu=j;f.mixin=function(a,e){if(!l(this))throw new TypeError("@mixin");return i(this,a,e,!0)};f.owns=m;f.resample=function(a,e){var d,c;if(!0===
+a||!arguments.length)a=this;void 0===e&&(e=o(a));c=j(e);for(d in a){if(!m.call(a,d))break;c[d]=a[d]}return c};f.expand=i;return f});

0 comments on commit b284746

Please sign in to comment.