library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix hasOwnProperty

Browse Source 
Some items, like html elements, could cause an error in the
hasOwnProperty function.
This commit is contained in:
mike 2016-06-25 16:11:47 -04:00
parent ec87369a6e
commit 9c4608cd5f
3 changed files with 89 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/dat.gui.js
View File

@ -175,8 +175,14 @@ dat.utils.common = (function () {
hasOwnProperty: function (obj, prop) { hasOwnProperty: function (obj, prop) {
var proto = obj.__proto__ || obj.constructor.prototype; var proto = obj.__proto__ || obj.constructor.prototype;
var proto_prop = undefined;
try {
proto_prop = proto[prop];
} catch (err) {
console.warn('property "' + prop + '" is unaccessible in prototype of object', obj);
}
return (prop in obj) && return (prop in obj) &&
(!(prop in proto) || (proto[prop] !== obj[prop])); (!(prop in proto) || (proto_prop !== obj[prop]));
} }
}; };

150
build/dat.gui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/dat/utils/common.js
View File

@ -136,8 +136,14 @@ define([], function () {
hasOwnProperty: function (obj, prop) { hasOwnProperty: function (obj, prop) {
var proto = obj.__proto__ || obj.constructor.prototype; var proto = obj.__proto__ || obj.constructor.prototype;
var proto_prop = undefined;
try {
proto_prop = proto[prop];
} catch (err) {
console.warn('property "' + prop + '" is unaccessible in prototype of object', obj);
}
return (prop in obj) && return (prop in obj) &&
(!(prop in proto) || (proto[prop] !== obj[prop])); (!(prop in proto) || (proto_prop !== obj[prop]));
} }
}; };