From d249ca6bb360cf35168bf11b1c83815e5cccac9c Mon Sep 17 00:00:00 2001 From: jonobr1 Date: Sat, 26 Mar 2011 11:11:28 -0700 Subject: [PATCH 1/2] made optional third argument to controller.boolean to set default value --- controllers/controller.boolean.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/controllers/controller.boolean.js b/controllers/controller.boolean.js index 2cb68b3..1d2ceb9 100644 --- a/controllers/controller.boolean.js +++ b/controllers/controller.boolean.js @@ -7,6 +7,14 @@ GUI.BooleanController = function() { var input = document.createElement('input'); input.setAttribute('type', 'checkbox'); + if(arguments[3]) { + input.checked = true; + this.setValue(true); + } else { + input.checked = false; + this.setValue(false); + } + this.domElement.addEventListener('click', function(e) { input.checked = !input.checked; e.preventDefault(); From f95262fcd216de2ff23be9eb6667c72abd72a75b Mon Sep 17 00:00:00 2001 From: jonobr1 Date: Sat, 26 Mar 2011 11:34:44 -0700 Subject: [PATCH 2/2] updating pull request inline of szimek's request to delete duplicate methods in slider.js - great find --- controllers/slider.js | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/controllers/slider.js b/controllers/slider.js index c7cec99..dc19180 100644 --- a/controllers/slider.js +++ b/controllers/slider.js @@ -58,33 +58,6 @@ GUI.Slider = function(numberController, min, max, step, initValue) { this.fg.style.width = pct+"%"; }); - var onDrag = function(e) { - if (!clicked) return; - var pos = findPos(_this.domElement); - var val = GUI.map(e.pageX, pos[0], pos[0] + _this.domElement.offsetWidth, min, max); - val = Math.round(val/step)*step; - numberController.setValue(val); - }; - - this.domElement.addEventListener('mousedown', function(e) { - clicked = true; - x = px = e.pageX; - _this.domElement.setAttribute('class', 'guidat-slider-bg active'); - _this.fg.setAttribute('class', 'guidat-slider-fg active'); - onDrag(e); - document.addEventListener('mouseup', mouseup, false); - }, false); - - var mouseup = function(e) { - _this.domElement.setAttribute('class', 'guidat-slider-bg'); - _this.fg.setAttribute('class', 'guidat-slider-fg'); - clicked = false; - if (numberController.finishChangeFunction != null) { - numberController.finishChangeFunction.call(this, numberController.getValue()); - } - document.removeEventListener('mouseup', mouseup, false); - }; - document.addEventListener('mousemove', onDrag, false); this.value = initValue;