blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-21 08:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added private _onComplete method to AjaxLib that calls the eventually given completeCallback and hides the veil

Browse Source 
- Changed method _checkAndGenerateAjaxParams to add the possibility to give a completeCallback function as parameter of the Ajax call
This commit is contained in:
Paolo
2018-07-09 11:24:01 +02:00
parent 6791f58cb2
commit 4a29c03c39
1 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/AjaxLib.js
+41 -7
View File
@@ -260,11 +260,30 @@ var FHC_AjaxClient = {
FHC_AjaxClient._printDebug(this._data, null, errorThrown); // debug time!
// Call the error callback saved in _errorCallback property
// NOTE: this is not referred to FHC_AjaxClient but to the ajax object
// Call the error callback saved in _errorCallback property
// NOTE: this is not referred to FHC_AjaxClient but to the ajax object
this._errorCallback(jqXHR, textStatus, errorThrown);
},
/**
* Method to call after the ajax call has ended
*/
_onComplete: function(jqXHR, textStatus) {
FHC_AjaxClient._printDebug(this._data, null, jqXHR.responseJSON); // debug time!
// Call the complete callback if it was saved in the _completeCallback property
// NOTE: this is not referred to FHC_AjaxClient but to the ajax object.
// It's known that it's a function because it was already checked before in the
// _checkAndGenerateAjaxParams method
if (this.hasOwnProperty("_completeCallback"))
{
this._completeCallback(jqXHR, textStatus);
}
FHC_AjaxClient._hideVeil(); // finally hide the veil
},
/**
* If an error callback is not given, this is the default error callback that is used
* to display useful info about the occurred error. It uses the JQuery UI dialog
@@ -460,14 +479,27 @@ var FHC_AjaxClient = {
}
}
// If present, veilTimeout must be a number and cannot be less then 0 or greater then 60000
if (ajaxCallParameters.hasOwnProperty("veilTimeout") && typeof ajaxCallParameters.veilTimeout == "number")
// If present, completeCallback must be a function
if (ajaxCallParameters.hasOwnProperty("completeCallback"))
{
if (typeof ajaxCallParameters.completeCallback == "function")
{
ajaxParameters._completeCallback = ajaxCallParameters.completeCallback; // save as property the callback complete
}
else
{
console.error("Invalid completeCallback, it must be a function");
valid = false;
}
}
// If present, veilTimeout must be a number and cannot be less then 0 or greater then 60000
if (ajaxCallParameters.hasOwnProperty("veilTimeout") && typeof ajaxCallParameters.veilTimeout == "number")
{
if (ajaxCallParameters.veilTimeout > 0 && ajaxCallParameters.veilTimeout < 60000)
{
ajaxParameters._veilTimeout = ajaxCallParameters.veilTimeout;
ajaxParameters.beforeSend = FHC_AjaxClient._showVeil;
ajaxParameters.complete = FHC_AjaxClient._hideVeil;
}
else if(ajaxCallParameters.veilTimeout == 0)
{
@@ -478,13 +510,15 @@ var FHC_AjaxClient = {
console.error("Invalid veilTimeout parameter, must be a number >= 0 and <= 60000");
valid = false;
}
}
}
else // is not present or the value is invalid
{
ajaxParameters._veilTimeout = VEIL_TIMEOUT;
ajaxParameters.beforeSend = FHC_AjaxClient._showVeil;
ajaxParameters.complete = FHC_AjaxClient._hideVeil;
}
// Function to call after the ajax call is ended, is it here because it must be always called
ajaxParameters.complete = FHC_AjaxClient._onComplete;
}
if (valid === false)