fixing attachment of objects on global mode

Author: lauren mccarthy

lib/p5.js

@@ -1,4 +1,4 @@
-/*! p5.js v0.3.3 August 22, 2014 */
+/*! p5.js v0.3.3 August 25, 2014 */
 var shim = function (require) {
     window.requestDraw = function () {
       return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback, element) {
@@ -247,11 +247,18 @@ var core = function (require, shim, constants) {
             }
           });
           if (this._isGlobal) {
-            for (var p in p5.prototype) {
+            for (var p0 in p5.prototype) {
               try {
-                delete window[p];
+                delete window[p0];
               } catch (x) {
-                window[p] = undefined;
+                window[p0] = undefined;
+              }
+            }
+            for (var p1 in p5) {
+              try {
+                delete window[p1];
+              } catch (x) {
+                window[p1] = undefined;
               }
             }
             for (var p2 in this) {
@@ -271,16 +278,19 @@ var core = function (require, shim, constants) {
       }
       if (!sketch) {
         this._isGlobal = true;
-        for (var p in p5.prototype) {
-          if (typeof p5.prototype[p] === 'function') {
-            var ev = p.substring(2);
+        for (var p0 in p5.prototype) {
+          if (typeof p5.prototype[p0] === 'function') {
+            var ev = p0.substring(2);
             if (!this._events.hasOwnProperty(ev)) {
-              window[p] = p5.prototype[p].bind(this);
+              window[p0] = p5.prototype[p0].bind(this);
             }
           } else {
-            window[p] = p5.prototype[p];
+            window[p0] = p5.prototype[p0];
           }
         }
+        for (var p1 in p5) {
+          window[p1] = p5[p1];
+        }
         for (var p2 in this) {
           if (this.hasOwnProperty(p2)) {
             window[p2] = this[p2];