diff --git a/public/css/AjaxLib.css b/public/css/AjaxLib.css
index 61c9f9234..46711a2d9 100644
--- a/public/css/AjaxLib.css
+++ b/public/css/AjaxLib.css
@@ -1,4 +1,4 @@
-.veil {
+.fhc-ajaxclient-veil {
position: absolute;
z-index: 9999;
top: 0;
@@ -11,3 +11,26 @@
background-repeat: no-repeat;
background-position: center;
}
+
+.fhc-ajaxclient-error-td {
+ padding-right: 10px;
+}
+
+.no-close .ui-dialog-titlebar-close {
+ display: none;
+}
+
+.ui-dialog-buttonset {
+ padding-top: 10px;
+ width: 100%;
+ text-align: center;
+}
+
+.ui-dialog-buttonset button {
+ width: 50%;
+ font-weight: bold;
+}
+
+.ui-front {
+ z-index: 9999;
+}
diff --git a/public/css/NavigationWidget.css b/public/css/NavigationWidget.css
index b6d6c800e..0baaa684a 100644
--- a/public/css/NavigationWidget.css
+++ b/public/css/NavigationWidget.css
@@ -41,7 +41,6 @@
padding-right: 20px;
padding-left: 7px;
font-size: 18px;
- line-height: 20px;
}
.navbar-brand-icon {
diff --git a/public/js/AjaxLib.js b/public/js/AjaxLib.js
index 431d251b6..b47654041 100644
--- a/public/js/AjaxLib.js
+++ b/public/js/AjaxLib.js
@@ -128,7 +128,7 @@ var FHC_AjaxClient = {
* Retrives error message from response object
*/
getError: function(response) {
- var error = 'Generic error';
+ var error = "Generic error";
if (jQuery.type(response) == "object" && !jQuery.isEmptyObject(response) && response.hasOwnProperty(RESPONSE))
{
@@ -182,13 +182,13 @@ var FHC_AjaxClient = {
*/
getUrlParameter: function(sParam) {
var sPageURL = decodeURIComponent(window.location.search.substring(1)),
- sURLVariables = sPageURL.split('&'),
+ sURLVariables = sPageURL.split("&"),
sParameterName,
i;
for (var i = 0; i < sURLVariables.length; i++)
{
- sParameterName = sURLVariables[i].split('=');
+ sParameterName = sURLVariables[i].split("=");
if (sParameterName[0] === sParam)
{
@@ -260,11 +260,81 @@ 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
+ */
+ _defaultErrorCallback: function(jqXHR, textStatus, errorThrown) {
+
+ // Row table format
+ var tableRowFormat = "| %1s: | %2s |
";
+ var strDivDialog = ""; // dialog div and open the error table
+
+ // If textStatus is usable then place it in the table
+ if (textStatus != null) strDivDialog += tableRowFormat.replace(/%1s/g, "Error").replace(/%2s/g, textStatus);
+
+ // If errorThrown is usable then place it in the table
+ if (errorThrown != null) strDivDialog += tableRowFormat.replace(/%1s/g, "Error text").replace(/%2s/g, errorThrown);
+
+ // If jqXHR.status is usable then place it in the table
+ if (jqXHR != null && jqXHR.hasOwnProperty("status"))
+ {
+ strDivDialog += tableRowFormat.replace(/%1s/g, "HTTP status").replace(/%2s/g, jqXHR.status);
+ }
+
+ // If jqXHR.responseText is usable then place it in the table
+ if (jqXHR != null && jqXHR.hasOwnProperty("responseText"))
+ {
+ strDivDialog += tableRowFormat.replace(/%1s/g, "HTTP response").replace(/%2s/g, jqXHR.responseText);
+ }
+
+ strDivDialog += "
';
- jQuery.each(item['children'], function(i, e) {
+ jQuery.each(item["children"], function(i, e) {
if (e != null) strLeftMenu += FHC_NavigationWidget._buildLeftMenuStructure(e, ++depth);
});
diff --git a/public/js/PhrasesLib.js b/public/js/PhrasesLib.js
index d8c67d4f8..64b10759d 100644
--- a/public/js/PhrasesLib.js
+++ b/public/js/PhrasesLib.js
@@ -19,12 +19,13 @@ var FHC_PhrasesLib = {
/**
* Returns the phrase-text in the user's language
+ * NOTE: the parameter params is an object since associative arrays are NOT supported in JS
* @param {String} category : phrase-category
* @param {String} phrase : phrase-name
- * @param {array} params : String-parameters to be set in variables in phrasentext
+ * @param {Object} params : parameters to be replaced instead of {} in phraseObj.text
* @returns {String} : phrase-text
*/
- t: function (category, phrase, params = []) {
+ t: function(category, phrase, params = {}) {
// Checks if FHC_JS_PHRASES_STORAGE_OBJECT is an array
if ($.isArray(FHC_JS_PHRASES_STORAGE_OBJECT))
@@ -41,11 +42,11 @@ var FHC_PhrasesLib = {
&& phraseObj.text.trim() != '')
{
// If params is null or not an array
- if (params == null || (params != null && !$.isArray(params)))
+ if (params == null)
{
- params = [];
+ params = {};
}
-
+
return FHC_PhrasesLib._replacePhraseVariable(phraseObj.text, params); // parsing
}
}
@@ -59,15 +60,21 @@ var FHC_PhrasesLib = {
/**
* Returns phrase with variables being replaced
+ * NOTE: params is an object but here is treat as an associative array, not that much orthodox but it works fine ;)
* @param {String} phrase : phrasen-text (with one ore more variables)
- * @param {array} replaceStringArr : String-array to be set in variables in phrasentext (order matters)
+ * @param {Object} params : parameters to be replaced instead of {} in phrase
* @returns {String} : replaced phrasen-text
*/
- _replacePhraseVariable: function (phrase, replaceStringArr) {
- for (var i = 0; i < replaceStringArr.length; i++)
+ _replacePhraseVariable: function(phrase, params) {
+
+ // Loops
+ for (var paramName in params)
{
- phrase = phrase.replace(/\{(.*?)\}/, replaceStringArr[i]);
+ var paramValue = params[paramName];
+
+ phrase = phrase.replace('{' + paramName + '}', paramValue);
}
+
return phrase;
}
};