Merge branch 'release-1.2'

10 years ago · 7e4d005ee1
parent 72e4f1caa3 233a25a060
commit 7e4d005ee1
2 changed files with 149 additions and 2 deletions
--- a/web/ui/bindata.go
+++ b/web/ui/bindata.go
--- a/web/ui/static/js/graph.js
+++ b/web/ui/static/js/graph.js
@ -779,9 +779,8 @@ Prometheus.Page.QueryParamHelper.prototype.parseQueryParamsOfOneGraph = function
  queryParams.forEach(function(tuple) {
    var optionNameAndValue = tuple.split('=');
    var optionName = optionNameAndValue[0];
-    var optionValue = decodeURIComponent(optionNameAndValue[1]);

-    optionValue = optionValue.replace(/\+/g, " "); // $.param turns spaces into pluses
+    var optionValue = decodeURIComponent(optionNameAndValue[1].replace(/\+/g, " "));

    if (optionName == "tab") {
      optionValue = parseInt(optionValue); // tab is integer