mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 21:54:10 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1697 from sigma-star/master

Browse source 
Fix JS XHR requests in prom_console.js on IE11
This commit is contained in:
Julius Volz 2016-06-01 20:15:02 -05:00
parent 9e952a55c6 2dd80225a4
commit 2eaccdd111
2 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
web/ui/bindata.go
View file

File diff suppressed because one or more lines are too long

3
web/ui/static/js/prom_console.js
View file

@ -543,6 +543,9 @@ PromConsole.Graph.prototype.dispatch = function() {
return; return;
} }
var data = xhr.response; var data = xhr.response;
if (typeof data !== "object") {
data = JSON.parse(xhr.responseText);
}
pending_requests -= 1; pending_requests -= 1;
all_data[i] = data; all_data[i] = data;
if (pending_requests === 0) { if (pending_requests === 0) {