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

Author: Lauren McCarthy

.all-contributorsrc

@@ -1270,6 +1270,13 @@
       "avatar_url": "https://avatars3.githubusercontent.com/u/7667514?s=460&v=4",
       "profile": "https://github.com/hackertron",
       "contributions": []
+    },
+    {
+      "login": "bansalnitish",
+      "name": "Nitish Bansal",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/22434689?v=4",
+      "profile": "https://github.com/bansalnitish",
+      "contributions": []
     }
   ]
 }

Gruntfile.js

@@ -328,6 +328,11 @@ module.exports = function(grunt) {
         }
       }
     },
+    open: {
+      yui: {
+        path: 'http://0.0.0.0:9001/docs/reference/'
+      }
+    },
     'saucelabs-mocha': {
       all: {
         options: {
@@ -391,6 +396,7 @@ module.exports = function(grunt) {
   // Load the external libraries used.
   grunt.loadNpmTasks('grunt-contrib-compress');
   grunt.loadNpmTasks('grunt-contrib-connect');
+  grunt.loadNpmTasks('grunt-open');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-eslint');
   grunt.loadNpmTasks('grunt-contrib-watch');
@@ -433,6 +439,13 @@ module.exports = function(grunt) {
   grunt.registerTask('test:nobuild', ['eslint:test', 'connect', 'mocha']);
   grunt.registerTask('yui', ['yuidoc:prod', 'minjson', 'typescript']);
   grunt.registerTask('yui:test', ['yuidoc:prod', 'connect', 'mocha:yui']);
+  grunt.registerTask('yui:dev', [
+    'yui:prod',
+    'browserify',
+    'connect',
+    'open:yui',
+    'watch:yui'
+  ]);
   grunt.registerTask('default', ['test']);
   grunt.registerTask('saucetest', ['connect', 'saucelabs-mocha']);
 };

lib/addons/p5.dom.js

@@ -179,6 +179,7 @@
    * Helper function for getElement and getElements.
    */
   p5.prototype._wrapElement = function(elt) {
+    var children = Array.prototype.slice.call(elt.children);
     if (elt.tagName === 'INPUT' && elt.type === 'checkbox') {
       var converted = new p5.Element(elt);
       converted.checked = function() {
@@ -196,6 +197,13 @@
       return new p5.MediaElement(elt);
     } else if (elt.tagName === 'SELECT') {
       return this.createSelect(new p5.Element(elt));
+    } else if (
+      children.length > 0 &&
+      children.every(function(c) {
+        return c.tagName === 'INPUT' || c.tagName === 'LABEL';
+      })
+    ) {
+      return this.createRadio(new p5.Element(elt));
     } else {
       return new p5.Element(elt);
     }
@@ -675,8 +683,9 @@
    * }
    * </code></div>
    */
-  p5.prototype.createRadio = function() {
+  p5.prototype.createRadio = function(existing_radios) {
     p5._validateParameters('createRadio', arguments);
+    // do some prep by counting number of radios on page
     var radios = document.querySelectorAll('input[type=radio]');
     var count = 0;
     if (radios.length > 1) {
@@ -694,14 +703,30 @@
     } else if (radios.length === 1) {
       count = 1;
     }
-    var elt = document.createElement('div');
-    var self = addElement(elt, this);
+    // see if we got an existing set of radios from callee
+    var elt, self;
+    if (typeof existing_radios === 'object') {
+      // use existing elements
+      self = existing_radios;
+      elt = this.elt = existing_radios.elt;
+    } else {
+      // create a set of radio buttons
+      elt = document.createElement('div');
+      self = addElement(elt, this);
+    }
+    // setup member functions
+    self._getInputChildrenArray = function() {
+      return Array.prototype.slice.call(this.elt.children).filter(function(c) {
+        return c.tagName === 'INPUT';
+      });
+    };
+
     var times = -1;
     self.option = function(name, value) {
       var opt = document.createElement('input');
       opt.type = 'radio';
       opt.innerHTML = name;
-      if (arguments.length > 1) opt.value = value;
+      if (value) opt.value = value;
       else opt.value = name;
       opt.setAttribute('name', 'defaultradio' + count);
       elt.appendChild(opt);
@@ -715,35 +740,31 @@
       }
       return opt;
     };
-    self.selected = function() {
-      var i,
-        length = this.elt.childNodes.length;
-      if (arguments.length === 1) {
-        for (i = 0; i < length; i += 2) {
-          if (this.elt.childNodes[i].value === arguments[0])
-            this.elt.childNodes[i].checked = true;
+    self.selected = function(value) {
+      var i;
+      var inputChildren = self._getInputChildrenArray();
+      if (value) {
+        for (i = 0; i < inputChildren.length; i++) {
+          if (inputChildren[i].value === value) inputChildren[i].checked = true;
         }
         return this;
       } else {
-        for (i = 0; i < length; i += 2) {
-          if (this.elt.childNodes[i].checked)
-            return this.elt.childNodes[i].value;
+        for (i = 0; i < inputChildren.length; i++) {
+          if (inputChildren[i].checked === true) return inputChildren[i].value;
         }
       }
     };
-    self.value = function() {
-      var i,
-        length = this.elt.childNodes.length;
-      if (arguments.length === 1) {
-        for (i = 0; i < length; i += 2) {
-          if (this.elt.childNodes[i].value === arguments[0])
-            this.elt.childNodes[i].checked = true;
+    self.value = function(value) {
+      var i;
+      var inputChildren = self._getInputChildrenArray();
+      if (value) {
+        for (i = 0; i < inputChildren.length; i++) {
+          if (inputChildren[i].value === value) inputChildren[i].checked = true;
         }
         return this;
       } else {
-        for (i = 0; i < length; i += 2) {
-          if (this.elt.childNodes[i].checked)
-            return this.elt.childNodes[i].value;
+        for (i = 0; i < inputChildren.length; i++) {
+          if (inputChildren[i].checked === true) return inputChildren[i].value;
         }
         return '';
       }