tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loader.js: Add support for ajax progress timer 

refs #8369
refs #8848
This commit is contained in:
Johannes Meyer 2015-08-20 14:38:03 +02:00
parent 2fe3c6e5cf
commit e3d99cb00d
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/js/icinga/loader.js
View File

@ -42,13 +42,15 @@
/**
* Load the given URL to the given target
*
* @param {string} url URL to be loaded
* @param {object} target Target jQuery element
* @param {object} data Optional parameters, usually for POST requests
* @param {string} method HTTP method, default is 'GET'
* @param {string} action How to handle the response ('replace' or 'append'), default is 'replace'
* @param {string} url URL to be loaded
* @param {object} target Target jQuery element
* @param {object} data Optional parameters, usually for POST requests
* @param {string} method HTTP method, default is 'GET'
* @param {string} action How to handle the response ('replace' or 'append'), default is 'replace'
* @param {boolean} autorefresh Whether the cause is a autorefresh or not
* @param {object} progressTimer A timer to be stopped when the request is done
*/
loadUrl: function (url, $target, data, method, action, autorefresh) {
loadUrl: function (url, $target, data, method, action, autorefresh, progressTimer) {
var id = null;
// Default method is GET
@ -131,6 +133,7 @@
req.autorefresh = autorefresh;
req.action = action;
req.addToHistory = true;
req.progressTimer = progressTimer;
if (id) {
this.requests[id] = req;
@ -537,6 +540,10 @@
return;
}
if (typeof req.progressTimer !== 'undefined') {
this.icinga.timer.unregister(req.progressTimer);
}
// .html() removes outer div we added above
this.renderContentToContainer($resp.html(), req.$target, req.action, req.autorefresh);
if (oldNotifications) {
@ -638,6 +645,10 @@
req.$target.data('icingaUrl', url);
}
if (typeof req.progressTimer !== 'undefined') {
this.icinga.timer.unregister(req.progressTimer);
}
if (req.status > 0) {
this.icinga.logger.error(
req.status,