Skip to content

Commit 3d56c74

Browse files
author
Lauren McCarthy
committed
merging select fix
1 parent 15ef1ef commit 3d56c74

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

lib/addons/p5.dom.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,8 @@
530530
* Creates a dropdown menu <select></select> element in the DOM.
531531
* It also helps to assign select-box methods to p5.Element when selecting existing select box
532532
* @method createSelect
533-
* @param {boolean} [multiple] true if dropdown should support multiple selections OR
534-
* @param {Object|p5.Element} if wrapping methods to existing select
535-
* @return {Object|p5.Element} pointer to p5.Element holding created or existing node
533+
* @param {boolean} [multiple] true if dropdown should support multiple selections
534+
* @return {p5.Element}
536535
* @example
537536
* <div><code>
538537
* var sel;
@@ -555,21 +554,26 @@
555554
* }
556555
* </code></div>
557556
*/
557+
/**
558+
* @method createSelect
559+
* @param {Object} existing DOM select element
560+
* @return {p5.Element}
561+
*/
558562

559563
p5.prototype.createSelect = function() {
560-
var elt,self;
564+
var elt, self;
561565
var arg = arguments[0];
562-
if( typeof arg === 'object' && arg.elt.nodeName == 'SELECT' ){
566+
if( typeof arg === 'object' && arg.elt.nodeName === 'SELECT' ) {
563567
self = arg;
564568
elt = this.elt = arg.elt;
565-
}else{
569+
} else {
566570
elt = document.createElement('select');
567-
if( arg && typeof arg === 'boolean' ){
571+
if( arg && typeof arg === 'boolean' ) {
568572
elt.setAttribute('multiple', 'true');
569573
}
570574
self = addElement(elt, this);
571575
}
572-
self.option = function(name, value){
576+
self.option = function(name, value) {
573577
var opt = document.createElement('option');
574578
opt.innerHTML = name;
575579
if (arguments.length > 1)
@@ -578,22 +582,22 @@
578582
opt.value = name;
579583
elt.appendChild(opt);
580584
};
581-
self.selected = function(value){
585+
self.selected = function(value) {
582586
var arr = [];
583-
if (arguments.length > 0){
584-
for (var i = 0; i < this.elt.length; i++){
585-
if (value.toString() === this.elt[i].value){
587+
if (arguments.length > 0) {
588+
for (var i = 0; i < this.elt.length; i++) {
589+
if (value.toString() === this.elt[i].value) {
586590
this.elt.selectedIndex = i;
587591
}
588592
}
589593
return this;
590-
}else{
591-
if (arg){
592-
for (var i = 0; i < this.elt.selectedOptions.length; i++){
594+
} else {
595+
if (arg) {
596+
for (var i = 0; i < this.elt.selectedOptions.length; i++) {
593597
arr.push(this.elt.selectedOptions[i].value);
594598
}
595599
return arr;
596-
}else{
600+
} else {
597601
return this.elt.value;
598602
}
599603
}

0 commit comments

Comments
 (0)