scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-01 02:38:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Bootstrap to not fail when overriding existing beans or getter / setters.

Browse source
This commit is contained in:
Jürg Lehni 2011-02-16 00:18:08 +00:00
parent b0b9594f1e
commit 00ee00d6ac
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Bootstrap.js
View file

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