diff --git a/lib/Bootstrap.js b/lib/Bootstrap.js index 0711fba4..e389a10a 100644 --- a/lib/Bootstrap.js +++ b/lib/Bootstrap.js @@ -16,7 +16,6 @@ * where deemeded necessary. * See http://www.bootstrap-js.net/wiki/MootoolsDifferences */ - new function() { var fix = !this.__proto__ && [Function, Number, Boolean, String, Array, Date, RegExp]; if (fix) @@ -53,13 +52,11 @@ new function() { } function inject(dest, src, enumerable, base, preserve, generics) { - var beans; + var beans, bean; function field(name, val, dontCheck, generics) { - if (!val) - val = (val = describe(src, name)) && (val.get ? val : val.value); - var type = typeof val, func = type == 'function', res = val, - prev = dest[name], bean, part; + var val = val || (val = describe(src, name)) && (val.get ? val : val.value), + func = typeof val == 'function', res = val, prev = val && val.get ? null : dest[name]; if (generics && func && (!preserve || !generics[name])) generics[name] = function(bind) { return bind && dest[name].apply(bind, Array.prototype.slice.call(arguments, 1));