Merge branch 'master' of github.com:jonobr1/GUI-DAT

controller.number.js

@@ -9,15 +9,30 @@ var NumberController = function() {
     
     var _this = this;
     
+    // If we simply click and release a number field, we want to highlight it.
+    // This variable keeps track of whether or not we've draggedNumberField.
+    var draggedNumberField = false;
+    var clickedNumberField = false;
+    
     var y = py = 0;
     
     var min = arguments[2];
     var max = arguments[3];
-    var step = arguments[4] || (max - min) * 0.01;
+    var step = arguments[4];
+    
+    if (!step) {
+    	if (min && max) {
+    		step = (max-min)*0.01;
+    	} else {
+    		step = 1;
+    	}	
+    }
     
     var numberField = document.createElement('input');
     numberField.setAttribute('id', this.propertyName);
-    numberField.setAttribute('type', this.type);
+    
+    // Little up and down arrows are pissing me off.
+    numberField.setAttribute('type', 'text');
     numberField.setAttribute('value', this.getValue());
     
     if (step) numberField.setAttribute('step', step);
@@ -35,9 +50,6 @@ var NumberController = function() {
 		slider.setAttribute('min', min);
 		slider.setAttribute('max', max);
 		
-		numberField.setAttribute('min', min);
-		numberField.setAttribute('max', max);
-		
         slider.setAttribute('step', step);
 		slider.addEventListener('change', function(e) {
 			updateValue(this.value);
@@ -60,6 +72,7 @@ var NumberController = function() {
     
     numberField.addEventListener('mousedown', function(e) {
         py = y = e.pageY;
+		clickedNumberField = true;
         document.addEventListener('mousemove', dragNumberField, false);
     }, false);
     
@@ -67,6 +80,12 @@ var NumberController = function() {
         document.removeEventListener('mousemove', dragNumberField, false);
         _this.makeSelectable(GUI.domElement); 
         _this.makeSelectable(numberField);
+        if (clickedNumberField && !draggedNumberField) { 
+	        numberField.focus();
+	        numberField.select();
+        }
+        draggedNumberField = false;
+        clickedNumberField = false;
     }, false);
     
     if(navigator.appVersion.indexOf('chrome') != -1) {
@@ -76,9 +95,15 @@ var NumberController = function() {
     }
     
     var dragNumberField = function(e) {
+    	draggedNumberField = true;
 		e.preventDefault();
+		
+		// We don't want to be highlighting this field as we scroll.
+		// Or any other fields in this gui for that matter ... 
+		// TODO: Make makeUselectable go through each element and child element.
 		_this.makeUnselectable(GUI.domElement);
 		_this.makeUnselectable(numberField);
+		
 		py = y;
 		y = e.pageY;
 		var dy = py - y;
@@ -88,6 +113,9 @@ var NumberController = function() {
     }
     
     var updateValue = function(val) {
+
+		val = parseFloat(val);
+		
     	if (min && val <= min) {
     		val = min;
     	} else if (max && val >= max) { 

gui.css

@@ -47,21 +47,25 @@
 }
 
 .guidat-controller.boolean:hover,
-.guidat-controller.function:hover{
+.guidat-controller.function:hover {
 	background-color: #000;
 }
+
 .guidat-controller input { 
 	float: right;
 	outline: none;
 	border: 0;
 	padding: 2px;
 }
+
 .guidat-controller.number { 
 	border-left: 5px solid #00aeff ;
 }
+
 .guidat-controller.string { 
 	border-left: 5px solid #1ed36f;
 }
+
 .guidat-controller.string input { 
 	border: 0;
 	text-align: right;
@@ -69,18 +73,22 @@
 	
 	background-color: rgba(0,0,0,0);
 }
+
 .guidat-controller.boolean { 
 	border-left: 5px solid #54396e;
 }
+
 .guidat-controller.function { 
 	border-left: 5px solid #e61d5f;
 }
-.guidat-controller.number input[type=number] {
+
+.guidat-controller.number input[type=text] {
 	width: 45px;
 	margin-left: 10px;
 }
+
 .guidat-controller.number input[type=slider] {
-	width: 45px;
+	width: 50%;
 
 }
 

slider.js

@@ -0,0 +1,5 @@
+var Slider = function() {
+	
+	this.domElement = document.createElement('canvas');
+	
+}