135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace jquery load with fetch (#828)

Browse Source
This commit is contained in:
Oliver Gorwits
2021-10-12 13:09:18 +01:00
parent 6e79e1fa05
commit 29de4465f9
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -1,4 +1,5 @@
share/public/javascripts/*.map binary
share/public/javascripts/*.min.js binary
share/public/javascripts/jquery-history.js binary
share/public/css/*.min.css binary
share/public/swagger-ui/* binary

24
share/public/javascripts/netdisco.js
View File

@@ -64,30 +64,6 @@ function do_search (event, tab) {
);
console.error('There has been a problem with your fetch operation:', error);
});
// $(target).load( uri_base + '/ajax/content/' + path + '/' + tab + '?' + query,
// function(response, status, xhr) {
// if (status !== "success") {
// $(target).html(
// '<div class="span5 alert alert-error"><i class="icon-warning-sign"></i> ' +
// 'Search failed! Please contact your site administrator.</div>'
// );
// return;
// }
// if (response == "") {
// $(target).html(
// '<div class="span2 alert alert-info">No matching records.</div>'
// );
// }
//
// // delegate to any [device|search] specific JS code
// $('div.content > div.tab-content table.nd_floatinghead').floatThead({
// scrollingTop: 40
// ,useAbsolutePositioning: false
// });
// inner_view_processing(tab);
// }
// );
}
// keep track of which tabs have a sidebar, for when switching tab

23
share/views/index.tt
View File

@@ -113,12 +113,25 @@
$('.nd_chevron').toggleClass('icon-chevron-up icon-chevron-down');
if (! stats_loaded) {
$('#nd_stats').load("[% uri_for('/ajax/content/statistics') | none %]", function(r,s,x) {
if (s == "error") {
fetch( "[% uri_for('/ajax/content/statistics') | none %]",
{ headers: { 'X-Requested-With': 'XMLHttpRequest' } })
.then( response => {
if (! response.ok) {
$('#nd_stats_status').addClass('alert-error')
.html('<i class="icon-warning-sign"></i> Failed to retrieve system information (server error).');
return;
// throw new Error('Network response was not ok');
}
return response.text();
})
.then( content => {
$('#nd_stats').html(content);
})
.catch( error => {
$('#nd_stats_status').addClass('alert-error')
.html('<i class="icon-warning-sign"></i> Failed to retrieve system information.');
}
});
.html('<i class="icon-warning-sign"></i> Failed to retrieve system information (network error: ' + error + ').');
console.error('There has been a problem with your fetch operation:', error);
});
stats_loaded = 1;
}
});