From 20a77d79375f88b15c87bf1fbdeb91ea780edfab Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Thu, 7 Mar 2013 12:35:41 -0700
Subject: [PATCH] more fixing of hasOwnProperty

---
 whalesong/web-world/js-impl.js | 13 ++++++-------
 whalesong/world/raw-jsworld.js | 12 +++++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/whalesong/web-world/js-impl.js b/whalesong/web-world/js-impl.js
index 1b069fd..9cb3d1c 100644
--- a/whalesong/web-world/js-impl.js
+++ b/whalesong/web-world/js-impl.js
@@ -925,6 +925,7 @@
         return lst;
     };
 
+    var hasOwnProperty = {}.hasOwnProperty;
 
 
 
@@ -937,7 +938,7 @@
         // that the object has a hasOwnProperty before I use it.  I've intentionally
         // turned off jslint's forin check because it's breaking here:
         for (key in obj) {
-            if (obj.hasOwnProperty && obj.hasOwnProperty(key)) {
+            if (hasOwnProperty.call(obj, key)) {
                 val = obj[key];
                 if (typeof(val) === 'number') {
                     result = makePair(makeList(makeSymbol(key),
@@ -1074,11 +1075,9 @@
         var that = this;
         if (this.id === undefined) {
             var success = function(position) {
-                if (position.hasOwnProperty &&
-                    position.hasOwnProperty('coords') &&
-                    position.coords.hasOwnProperty &&
-                    position.coords.hasOwnProperty('latitude') &&
-                    position.coords.hasOwnProperty('longitude')) {
+                if (hasOwnProperty.call(position, 'coords') &&
+                    hasOwnProperty.call(position.coords, 'latitude') &&
+                    hasOwnProperty.call(position.coords, 'longitude')) {
                     fireEvent(undefined,
                               objectToEvent({ 'latitude' : Number(position.coords.latitude),
                                               'longitude' : Number(position.coords.longitude) }));
@@ -1471,7 +1470,7 @@
     // ones, since there's an unbound number of those.
     var validElementNames = {};  
     var isValidElementName = function(name) {
-        if (! (validElementNames.hasOwnProperty(name))) {
+        if (! (hasOwnProperty.call(validElementNames, name))) {
             // Permissive parsing: see that the name is a valid
             // element type.
             // Is there a nicer way to do this besides exception
diff --git a/whalesong/world/raw-jsworld.js b/whalesong/world/raw-jsworld.js
index a1d6448..4d8511b 100644
--- a/whalesong/world/raw-jsworld.js
+++ b/whalesong/world/raw-jsworld.js
@@ -258,16 +258,18 @@ var rawJsworld = {};
     };
     Jsworld.fold = fold;
 
+    var hasOwnProperty = {}.hasOwnProperty;
+
 
     function augment(o, a) {
         var oo = {}, e;
         for (e in o) {
-            if (o.hasOwnProperty(e)) {
+            if (hasOwnProperty.call(o, e)) {
                 oo[e] = o[e];
             }
         }
         for (e in a) {
-            if (a.hasOwnProperty(e)) {
+            if (hasOwnProperty.call(a, e)) {
                 oo[e] = a[e];
             }
         }
@@ -279,7 +281,7 @@ var rawJsworld = {};
     function assoc_cons(o, k, v) {
         var oo = {}, e;
         for (e in o) {
-            if (o.hasOwnProperty(e)) {
+            if (hasOwnProperty.call(o, e)) {
                 oo[e] = o[e];
             }
         }
@@ -337,7 +339,7 @@ var rawJsworld = {};
     function without(obj, attrib) {
         var o = {}, a;
         for (a in obj) {
-            if (obj.hasOwnProperty(a)) {
+            if (hasOwnProperty.call(obj, a)) {
                 if (a !== attrib) {
                     o[a] = obj[a];
                 }
@@ -1263,7 +1265,7 @@ var rawJsworld = {};
         var a;
         if (attribs) {
             for (a in attribs) {
-                if (attribs.hasOwnProperty(a)) {
+                if (hasOwnProperty.call(attribs, a)) {
                     if (typeof attribs[a] === 'function') {
                         add_ev(node, a, attribs[a]);
                     } else {