From 4d53a2ee19a665cbf6c2c56ee9329af68d7ef6c5 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Thu, 29 Aug 2013 01:41:18 +0200
Subject: [PATCH] Properly reading all the values from the form when saving

---
 js/SettingsWindow.js | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/js/SettingsWindow.js b/js/SettingsWindow.js
index b736bee..0b9eaa6 100644
--- a/js/SettingsWindow.js
+++ b/js/SettingsWindow.js
@@ -102,16 +102,6 @@ function SettingsWindow() {
 	this.saveSettings = function(callback) {
 	  console.log("Settings:saveSettings");
 	  
-	  //var printerSettings = {};
-	  $("#printersettings input").each( function(index,element) {
-			var element = $(element);
-			//populate settings are with values from html
-			if(element.attr("type") == "text" || element.attr("type") == "number") {
-				settings[element.attr('name')] = element.val();
-			} else if(element.attr("type") == "checkbox") {
-				settings[element.attr('name')] = element.prop('checked')
-			}
-	  });
 	  this.readForm();
 	  
 	  if (communicateWithWifibox) {
@@ -171,7 +161,6 @@ function SettingsWindow() {
 			}
 		});
 		
-		// TODO: textarea's
 		var textareas = this.form.find("textarea");
 		console.log(textareas);
 		textareas.each( function(index,element) {
@@ -184,17 +173,31 @@ function SettingsWindow() {
 		});
 	}
 	
-	this.readForm = function() {
+	this.readForm = function() {	
 		console.log("SettingsWindow:readForm");
-		// read settings from form
+		var selects = this.form.find("select");
+		selects.each( function(index,element) {
+			var element = $(element);
+			settings[element.attr('name')] = element.val();
+		});
 		
-		// TODO: textarea's
+		var inputs = this.form.find("input");
+		inputs.each( function(index,element) {
+			var element = $(element);
+			switch(element.attr("type")) {
+				case "text": 
+				case "number":  
+					settings[element.attr('name')] = element.val();
+					break;
+				case "checkbox":
+					settings[element.attr('name')] = element.prop('checked')
+					break;
+			}
+		});
+	
 		var textareas = this.form.find("textarea");
-		console.log(textareas);
 		textareas.each( function(index,element) {
 			var element = $(element);
-			console.log("printer textarea: ",index,element.attr('name')); //,element);
-			console.log("  val: ",element.val());
 			settings[element.attr('name')] = element.val();
 		});
 		console.log(settings);