From 136799e16c80f3e42b5a34cbc3299835d6549f26 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 23 Dec 2013 17:40:14 +0100
Subject: [PATCH] No retain option during update

---
 js_src/UpdatePanel.js | 30 ++++++++++++++++++++++++------
 www/settings.html     |  2 ++
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/js_src/UpdatePanel.js b/js_src/UpdatePanel.js
index 6889c5c..39a5978 100644
--- a/js_src/UpdatePanel.js
+++ b/js_src/UpdatePanel.js
@@ -45,15 +45,21 @@ function UpdatePanel() {
 		this.wifiboxURL = wifiboxURL;
 		
 		this.element = updatePanelElement;
+		this.noRetainCheckbox = this.element.find("#noRetain");
 		this.btnUpdate = this.element.find("#update");
 		this.statusDisplay = this.element.find("#updateState");
 		this.infoDisplay = this.element.find("#updateInfo");
 		
+		this.noRetainCheckbox.change(this.noRetainChanged);
 		this.btnUpdate.click(this.update);
 		
 		this.checkStatus(false);
 	}
-	
+	this.noRetainChanged = function(e) {
+		console.log("UpdatePanel:noRetainChanged");
+		
+		self.setState(self.state,true);
+	}
 	this.update = function() {
 		console.log("UpdatePanel:update");
 		self.downloadUpdate();
@@ -75,10 +81,15 @@ function UpdatePanel() {
 	}
 	this.installUpdate = function() {
 		console.log("UpdatePanel:installUpdate");
+		
+		var noRetain = self.noRetainCheckbox.prop('checked');
+		
 		self.stopCheckingStatus();
+		postData = {no_retain:noRetain}
 		$.ajax({
 			url: self.wifiboxURL + "/update/install",
 			type: "POST",
+			data: postData,
 			dataType: 'json',
 			success: function(response){
 				console.log("UpdatePanel:installUpdate response: ",response);
@@ -158,20 +169,27 @@ function UpdatePanel() {
 				break;
 		}
 	}
-	this.setState = function(newState) {
-		if(this.state == newState) return;
-		console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (networkMode: ",self.networkMode,") (newestVersion: ",self.newestVersion,")");
+	this.setState = function(newState,refresh) {
+		console.log("UpdatePanel:setState");
+		if(!refresh && this.state == newState) return;
+		console.log("UpdatePanel:setState: ",this.state," > ",newState,"(",this.stateText,") (networkMode: ",self.networkMode,") (newestVersion: ",self.newestVersion,") (refresh: ",refresh,")");
 		this.state = newState;
 		
+		var noRetain = self.noRetainCheckbox.prop('checked');
+		console.log("  noRetain", noRetain);
+		
 		// download button
 		// if there isn't newestVersion data something went wrong, 
-		//   probably accessing the internet  
+		//   probably accessing the internet
+		console.log("  self.newestVersion: ",self.newestVersion);
 		if(self.newestVersion != undefined) {
+			console.log("  this.state: ",this.state);
 			switch(this.state){
 				case UpdatePanel.NONE: 
 				case UpdatePanel.DOWNLOAD_FAILED:
 				case UpdatePanel.INSTALL_FAILED:
-					if(self.canUpdate) {
+					console.log("  self.canUpdate: ",self.canUpdate);
+					if(self.canUpdate || noRetain) {
 						self.btnUpdate.removeAttr("disabled");
 					} else {
 						self.btnUpdate.attr("disabled", true);
diff --git a/www/settings.html b/www/settings.html
index dbf04a5..679f755 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -162,6 +162,8 @@
 
 	<fieldset id="updatePanel">
  		<legend>Update</legend>
+ 		<label for="noRetain">Remove personal data:</label><input id="noRetain" type="checkbox" name="" value="noRetain">
+ 		<br/><br/>
  		<input type="button" name="update" value="Update" class="button" id="update"/>
         <span id="updateState"></span><br/>
         <small id="updateInfo"></small>