Merge pull request #1697 from sigma-star/master

Fix JS XHR requests in prom_console.js on IE11

Merge pull request #1697 from sigma-star/master
Fix JS XHR requests in prom_console.js on IE11
2eaccdd1 · Julius Volz · 9e952a55 · 2dd80225 · 2eaccdd1 · 2eaccdd1
展开全部隐藏空白更改
内联并排

Showing with 40 addition and 37 deletion

web/ui/bindata.go web/ui/bindata.go +37 -37

web/ui/static/js/prom_console.js web/ui/static/js/prom_console.js +3 -0

未找到文件。
--- a/web/ui/bindata.go
+++ b/web/ui/bindata.go
--- a/web/ui/static/js/prom_console.js
+++ b/web/ui/static/js/prom_console.js
@@ -543,6 +543,9 @@ PromConsole.Graph.prototype.dispatch = function() {
        return;
      }
      var data = xhr.response;
+      if (typeof data !== "object") {
+        data = JSON.parse(xhr.responseText);
+      }
      pending_requests -= 1;
      all_data[i] = data;
      if (pending_requests === 0) {