merging upstream changes

Author: therewasaguy

docs/yuidoc-p5-theme/layouts/main.handlebars

@@ -69,6 +69,7 @@
       <li><a href="../learn/">Learn</a></li>
       <li><a href="../contribute/">Contribute</a></li>
       <li><a href="http://github.com/lmccart/p5.js" target=_blank class="other-link">Github</a></li>
+      <li><a href="http://twitter.com/p5xjs" target=_blank class="other-link">Twitter</a></li>
     </ul>
     <br />
     </div>

lib/p5.js

@@ -240,8 +240,11 @@ var core = function (require, shim, constants) {
               e.elt.removeEventListener(elt_ev, e._events[elt_ev]);
             }
           }
+          var self = this;
           this._registeredMethods.remove.forEach(function (f) {
-            f.call(this);
+            if (typeof f !== 'undefined') {
+              f.call(self);
+            }
           });
           if (this._isGlobal) {
             for (var p in p5.prototype) {
@@ -262,7 +265,6 @@ var core = function (require, shim, constants) {
             }
           }
         }
-        window.p5 = undefined;
       }.bind(this);
       for (var k in constants) {
         p5.prototype[k] = constants[k];

lib/p5.min.js

@@ -329,8 +329,11 @@ define(function (require) {
         }
 
         // call any registered remove functions
-        this._registeredMethods.remove.forEach(function(f) {
-          f.call(this);
+        var self = this;
+        this._registeredMethods.remove.forEach(function (f) {
+          if (typeof(f) !== 'undefined') {
+            f.call(self);
+          }
         });
 
         // remove window bound properties and methods
@@ -353,7 +356,7 @@ define(function (require) {
           }
         }
       }
-      window.p5 = undefined;
+      // window.p5 = undefined;
     }.bind(this);
 
 

src/core/core.js

@@ -11,16 +11,16 @@ define(function (require) {
   var p5 = require('core');
 
   /**
-   * The boolean system variable isKeyPressed is true if any key is pressed
+   * The boolean system variable keyIsPressed is true if any key is pressed
    * and false if no keys are pressed.
    *
-   * @property isKeyPressed   
+   * @property keyIsPressed   
    * @example
    * <div>
    * <code>
    * var value = 0;
    * function draw() {
-   *   if (isKeyPressed === true) {
+   *   if (keyIsPressed === true) {
    *     fill(0);
    *   } else {
    *     fill(255);

src/input/keyboard.js

@@ -33,6 +33,18 @@ define(function (require) {
    * @param {Number} [x] x component of the vector
    * @param {Number} [y] y component of the vector
    * @param {Number} [z] z component of the vector
+   * @example
+   * <div>
+   * <code> 
+   * var vector = createVector(40, 50);
+   * var vector2 = createVector(40, 50);
+   * 
+   * ellipse(vector.x, vector.y, 50, 50);
+   * ellipse(vector2.x, vector2.y, 50, 50);
+   * vector.add(vector2);
+   * ellipse(vector.x, vector.y, 50, 50);
+   *</div>
+   *</code>
    */
   p5.Vector = function() {
     var x,y,z;