From 16078d34787fdc53093dff0f43fb3217fd6db5f8 Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Mon, 10 Feb 2014 14:44:17 +0100
Subject: [PATCH] Moved retries out of API classes

---
 js/api/ConfigAPI.js      | 17 ++++++++---------
 js/api/NetworkAPI.js     | 12 +++++++-----
 js/settings/FormPanel.js |  4 ++++
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/js/api/ConfigAPI.js b/js/api/ConfigAPI.js
index b8f2d46..c6feb94 100644
--- a/js/api/ConfigAPI.js
+++ b/js/api/ConfigAPI.js
@@ -12,7 +12,6 @@ function ConfigAPI() {
 	var _wifiboxCGIBinURL;
 	var _timeoutTime 							= 3000;
 	var _saveSettingsTimeoutTime 	= 8000;
-	var _retryDelay 							= 2000; // retry setTimout delay
 	
 	var _self = this;
 
@@ -31,13 +30,13 @@ function ConfigAPI() {
 			timeout: _timeoutTime,
 			success: function(response){
 				if(response.status == "error" || response.status == "fail") {
-					failedHandler();
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			failedHandler();
+			if(failedHandler) failedHandler();
 		});
 	};
 	this.load = function(targetSettings,completeHandler,failedHandler) {
@@ -50,13 +49,13 @@ function ConfigAPI() {
 			timeout: _timeoutTime,
 			success: function(response){
 				if(response.status == "error" || response.status == "fail") {
-					failedHandler();
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			failedHandler();
+			if(failedHandler) failedHandler();
 		});
 	};
 	this.save = function(newSettings,completeHandler,failedHandler) {
@@ -70,13 +69,13 @@ function ConfigAPI() {
 			success: function(response){
 				//console.log("ConfigAPI:save response: ",response);
 				if(response.status == "error" || response.status == "fail") {
-					failedHandler();
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			failedHandler();
+			if(failedHandler) failedHandler();
 		});
 	};
 	this.resetAll = function(completeHandler,failedHandler) {
@@ -88,13 +87,13 @@ function ConfigAPI() {
 			timeout: _timeoutTime,
 			success: function(response){
 				if(response.status == "error" || response.status == "fail") {
-					failedHandler();
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			failedHandler();
+			if(failedHandler) failedHandler();
 		});
 	};
 }
\ No newline at end of file
diff --git a/js/api/NetworkAPI.js b/js/api/NetworkAPI.js
index c1b8663..016e28f 100644
--- a/js/api/NetworkAPI.js
+++ b/js/api/NetworkAPI.js
@@ -19,7 +19,6 @@ function NetworkAPI() {
 	var _wifiboxURL;
 	var _wifiboxCGIBinURL;
 	var _timeoutTime = 3000;
-	var _retryDelay = 2000; 					// retry setTimout delay
 	
 	var _self = this;
 
@@ -31,6 +30,7 @@ function NetworkAPI() {
 		_wifiboxCGIBinURL = wifiboxCGIBinURL;
 	}
 	this.scan = function(completeHandler) {
+	this.scan = function(completeHandler,failedHandler) {
 		//console.log("NetworkAPI:scan");
 		//console.log("  _wifiboxURL: ",_wifiboxURL);
 		$.ajax({
@@ -41,13 +41,15 @@ function NetworkAPI() {
 			success: function(response){
 				//console.log("NetworkAPI:scan response: ",response);
 				if(response.status == "error" || response.status == "fail") {
-					console.log("NetworkAPI:scan failed: ",response);
+					//console.log("NetworkAPI:scan failed: ",response);
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			console.log("NetworkAPI:scan failed");
+			//console.log("NetworkAPI:scan failed");
+			if(failedHandler) failedHandler();
 		});
 	};
 	this.status = function(completeHandler,failedHandler) {
@@ -60,13 +62,13 @@ function NetworkAPI() {
 			success: function(response){
 				//console.log("NetworkAPI:status response: ",response);
 				if(response.status == "error" || response.status == "fail") {
-					failedHandler();
+					if(failedHandler) failedHandler(response);
 				} else {
 					completeHandler(response.data);
 				}
 			}
 		}).fail(function() {
-			failedHandler();
+			if(failedHandler) failedHandler();
 		});
 	};
 	
diff --git a/js/settings/FormPanel.js b/js/settings/FormPanel.js
index 77d87fa..df2a81a 100644
--- a/js/settings/FormPanel.js
+++ b/js/settings/FormPanel.js
@@ -11,6 +11,10 @@ function FormPanel() {
 	var _configAPI = new ConfigAPI();
 	var _retryDelay = 2000;
 	var _retrySaveSettingsDelay;
+	var _retryLoadAllSettingsDelay;
+	var _retryLoadSettingsDelay;
+	var _retryResetSettingsDelay;
+	
 	// ui elements
 	var _element;