vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-24 18:17:56 +01:00
Code Issues Releases Wiki Activity

Moved retries out of API classes

Browse Source
This commit is contained in:
peteruithoven 2014-02-10 14:44:17 +01:00
parent eaed4c9efc
commit 16078d3478
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/api/ConfigAPI.js
View File

@ -12,7 +12,6 @@ function ConfigAPI() {
var _wifiboxCGIBinURL; var _wifiboxCGIBinURL;
var _timeoutTime = 3000; var _timeoutTime = 3000;
var _saveSettingsTimeoutTime = 8000; var _saveSettingsTimeoutTime = 8000;
var _retryDelay = 2000; // retry setTimout delay
var _self = this; var _self = this;
@ -31,13 +30,13 @@ function ConfigAPI() {
timeout: _timeoutTime, timeout: _timeoutTime,
success: function(response){ success: function(response){
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
failedHandler(); if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
failedHandler(); if(failedHandler) failedHandler();
}); });
}; };
this.load = function(targetSettings,completeHandler,failedHandler) { this.load = function(targetSettings,completeHandler,failedHandler) {
@ -50,13 +49,13 @@ function ConfigAPI() {
timeout: _timeoutTime, timeout: _timeoutTime,
success: function(response){ success: function(response){
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
failedHandler(); if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
failedHandler(); if(failedHandler) failedHandler();
}); });
}; };
this.save = function(newSettings,completeHandler,failedHandler) { this.save = function(newSettings,completeHandler,failedHandler) {
@ -70,13 +69,13 @@ function ConfigAPI() {
success: function(response){ success: function(response){
//console.log("ConfigAPI:save response: ",response); //console.log("ConfigAPI:save response: ",response);
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
failedHandler(); if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
failedHandler(); if(failedHandler) failedHandler();
}); });
}; };
this.resetAll = function(completeHandler,failedHandler) { this.resetAll = function(completeHandler,failedHandler) {
@ -88,13 +87,13 @@ function ConfigAPI() {
timeout: _timeoutTime, timeout: _timeoutTime,
success: function(response){ success: function(response){
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
failedHandler(); if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
failedHandler(); if(failedHandler) failedHandler();
}); });
}; };
} }

12
js/api/NetworkAPI.js
View File

@ -19,7 +19,6 @@ function NetworkAPI() {
var _wifiboxURL; var _wifiboxURL;
var _wifiboxCGIBinURL; var _wifiboxCGIBinURL;
var _timeoutTime = 3000; var _timeoutTime = 3000;
var _retryDelay = 2000; // retry setTimout delay
var _self = this; var _self = this;
@ -31,6 +30,7 @@ function NetworkAPI() {
_wifiboxCGIBinURL = wifiboxCGIBinURL; _wifiboxCGIBinURL = wifiboxCGIBinURL;
} }
this.scan = function(completeHandler) { this.scan = function(completeHandler) {
this.scan = function(completeHandler,failedHandler) {
//console.log("NetworkAPI:scan"); //console.log("NetworkAPI:scan");
//console.log(" _wifiboxURL: ",_wifiboxURL); //console.log(" _wifiboxURL: ",_wifiboxURL);
$.ajax({ $.ajax({
@ -41,13 +41,15 @@ function NetworkAPI() {
success: function(response){ success: function(response){
//console.log("NetworkAPI:scan response: ",response); //console.log("NetworkAPI:scan response: ",response);
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
console.log("NetworkAPI:scan failed: ",response); //console.log("NetworkAPI:scan failed: ",response);
if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
console.log("NetworkAPI:scan failed"); //console.log("NetworkAPI:scan failed");
if(failedHandler) failedHandler();
}); });
}; };
this.status = function(completeHandler,failedHandler) { this.status = function(completeHandler,failedHandler) {
@ -60,13 +62,13 @@ function NetworkAPI() {
success: function(response){ success: function(response){
//console.log("NetworkAPI:status response: ",response); //console.log("NetworkAPI:status response: ",response);
if(response.status == "error" || response.status == "fail") { if(response.status == "error" || response.status == "fail") {
failedHandler(); if(failedHandler) failedHandler(response);
} else { } else {
completeHandler(response.data); completeHandler(response.data);
} }
} }
}).fail(function() { }).fail(function() {
failedHandler(); if(failedHandler) failedHandler();
}); });
}; };

4
js/settings/FormPanel.js
View File

@ -11,6 +11,10 @@ function FormPanel() {
var _configAPI = new ConfigAPI(); var _configAPI = new ConfigAPI();
var _retryDelay = 2000; var _retryDelay = 2000;
var _retrySaveSettingsDelay; var _retrySaveSettingsDelay;
var _retryLoadAllSettingsDelay;
var _retryLoadSettingsDelay;
var _retryResetSettingsDelay;
// ui elements // ui elements
var _element; var _element;