suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixing of hasOwnProperty

Browse Source
This commit is contained in:
Danny Yoo 2013-03-07 12:35:41 -07:00
parent d4c9c5efdb
commit 20a77d7937
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
whalesong/web-world/js-impl.js
View File

@ -925,6 +925,7 @@
return lst; return lst;
}; };
var hasOwnProperty = {}.hasOwnProperty;
@ -937,7 +938,7 @@
// that the object has a hasOwnProperty before I use it. I've intentionally // that the object has a hasOwnProperty before I use it. I've intentionally
// turned off jslint's forin check because it's breaking here: // turned off jslint's forin check because it's breaking here:
for (key in obj) { for (key in obj) {
if (obj.hasOwnProperty && obj.hasOwnProperty(key)) { if (hasOwnProperty.call(obj, key)) {
val = obj[key]; val = obj[key];
if (typeof(val) === 'number') { if (typeof(val) === 'number') {
result = makePair(makeList(makeSymbol(key), result = makePair(makeList(makeSymbol(key),
@ -1074,11 +1075,9 @@
var that = this; var that = this;
if (this.id === undefined) { if (this.id === undefined) {
var success = function(position) { var success = function(position) {
if (position.hasOwnProperty && if (hasOwnProperty.call(position, 'coords') &&
position.hasOwnProperty('coords') && hasOwnProperty.call(position.coords, 'latitude') &&
position.coords.hasOwnProperty && hasOwnProperty.call(position.coords, 'longitude')) {
position.coords.hasOwnProperty('latitude') &&
position.coords.hasOwnProperty('longitude')) {
fireEvent(undefined, fireEvent(undefined,
objectToEvent({ 'latitude' : Number(position.coords.latitude), objectToEvent({ 'latitude' : Number(position.coords.latitude),
'longitude' : Number(position.coords.longitude) })); 'longitude' : Number(position.coords.longitude) }));
@ -1471,7 +1470,7 @@
// ones, since there's an unbound number of those. // ones, since there's an unbound number of those.
var validElementNames = {}; var validElementNames = {};
var isValidElementName = function(name) { var isValidElementName = function(name) {
if (! (validElementNames.hasOwnProperty(name))) { if (! (hasOwnProperty.call(validElementNames, name))) {
// Permissive parsing: see that the name is a valid // Permissive parsing: see that the name is a valid
// element type. // element type.
// Is there a nicer way to do this besides exception // Is there a nicer way to do this besides exception

12
whalesong/world/raw-jsworld.js
View File

@ -258,16 +258,18 @@ var rawJsworld = {};
}; };
Jsworld.fold = fold; Jsworld.fold = fold;
var hasOwnProperty = {}.hasOwnProperty;
function augment(o, a) { function augment(o, a) {
var oo = {}, e; var oo = {}, e;
for (e in o) { for (e in o) {
if (o.hasOwnProperty(e)) { if (hasOwnProperty.call(o, e)) {
oo[e] = o[e]; oo[e] = o[e];
} }
} }
for (e in a) { for (e in a) {
if (a.hasOwnProperty(e)) { if (hasOwnProperty.call(a, e)) {
oo[e] = a[e]; oo[e] = a[e];
} }
} }
@ -279,7 +281,7 @@ var rawJsworld = {};
function assoc_cons(o, k, v) { function assoc_cons(o, k, v) {
var oo = {}, e; var oo = {}, e;
for (e in o) { for (e in o) {
if (o.hasOwnProperty(e)) { if (hasOwnProperty.call(o, e)) {
oo[e] = o[e]; oo[e] = o[e];
} }
} }
@ -337,7 +339,7 @@ var rawJsworld = {};
function without(obj, attrib) { function without(obj, attrib) {
var o = {}, a; var o = {}, a;
for (a in obj) { for (a in obj) {
if (obj.hasOwnProperty(a)) { if (hasOwnProperty.call(obj, a)) {
if (a !== attrib) { if (a !== attrib) {
o[a] = obj[a]; o[a] = obj[a];
} }
@ -1263,7 +1265,7 @@ var rawJsworld = {};
var a; var a;
if (attribs) { if (attribs) {
for (a in attribs) { for (a in attribs) {
if (attribs.hasOwnProperty(a)) { if (hasOwnProperty.call(attribs, a)) {
if (typeof attribs[a] === 'function') { if (typeof attribs[a] === 'function') {
add_ev(node, a, attribs[a]); add_ev(node, a, attribs[a]);
} else { } else {