Merge branch 'master' of github.com:processing/p5.js

Author: Lauren McCarthy

lib/addons/p5.dom.js

@@ -211,11 +211,14 @@
   p5.prototype.createImg = function() {
     var elt = document.createElement('img');
     var args = arguments;
-    var self = {};
+    var self;
     var setAttrs = function(){
-      self.width = elt.width;
-      self.height = elt.height;
-      if (args.length === 3 && typeof args[2] === 'function'){
+      self.width = elt.offsetWidth;
+      self.height = elt.offsetHeight;
+      if (args.length > 1 && typeof args[1] === 'function'){
+        self.fn = args[1];
+        self.fn();
+      }else if (args.length > 1 && typeof args[2] === 'function'){
         self.fn = args[2];
         self.fn();
       }
@@ -224,12 +227,8 @@
     if (args.length > 1 && typeof args[1] === 'string'){
       elt.alt = args[1];
     }
-    if (elt.complete){
+    elt.onload = function(){
       setAttrs();
-    }else{
-      elt.onload = function(){
-        setAttrs();
-      }
     }
     self = addElement(elt, this);
     return self;

src/core/p5.Element.js

@@ -237,19 +237,36 @@ p5.Element.prototype.mouseOver = function (fxn) {
 
 
 /**
- * The .changed() function is called when the value of an element is changed.
+ * The .changed() function is called when the value of an
+ * element is changed.
  * This can be used to attach an element specific event listener.
  *
  * @method changed
- * @param  {Function} fxn function to be fired when mouse is
- *                    moved over the element.
+ * @param  {Function} fxn function to be fired when the value of an
+ * element changes.
  * @return {p5.Element}
  */
 p5.Element.prototype.changed = function (fxn) {
   attachListener('change', fxn, this);
   return this;
 };
 
+/**
+ * The .input() function is called when any user input is
+ * detected with an element. The input event is often used
+ * to detect keystrokes in a input element, or changes on a
+ * slider element. This can be used to attach an element specific
+ * event listener.
+ *
+ * @method input
+ * @param  {Function} fxn function to be fired on user input.
+ * @return {p5.Element}
+ */
+p5.Element.prototype.input = function (fxn) {
+  attachListener('input', fxn, this);
+  return this;
+};
+
 /**
  * The .mouseOut() function is called once after every time a
  * mouse moves off the element. This can be used to attach an