Commit c0db36df authored by Laura Schlimmer's avatar Laura Schlimmer
Browse files

fix query_params ds dependencies

parent c2b816d2
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ FnordMetric.WebUI = function() {

  function openUrl(raw_url, push_state) {
    var url = FnordMetric.util.parseQueryString(raw_url);
    console.log(url);
    var query_params = url["query_params"];

    view = routes[url["path"]];
+5 −5
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ FnordMetric.views.MetricList = function() {


  function render(viewport, url, query_params) {
    if (query_params != undefined) {
      actions[query_params.innerView].render(viewport, query_params);
    if (query_params.innerViewValue != undefined) {
      actions[query_params.innerViewValue].render(viewport, query_params);
      return;
    }
    loadMetricList(viewport, query_params);
@@ -108,10 +108,10 @@ FnordMetric.views.MetricList = function() {
      if (r.status == 200) {
        var json = JSON.parse(r.response);
        var search_item;
        if (query_params != undefined) {
        if (query_params.innerView != undefined) {
          json.metrics =
              actions[query_params.name].data(json.metrics, query_params.value);
          search_item = query_params.value;
              actions[query_params.innerView].data(json.metrics, query_params.innerViewValue);
          search_item = query_params.innerviewValue;
        }
        renderMetricList(viewport, json.metrics, search_item);
      } else {
+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ FnordMetric.views.QueryPlayground = function() {
    updateLayout(editor_pane, result_pane, direction);

    if (query_params != undefined) {
      current_view = urlName[query_params.name];
      query = query_params.value;
      current_view = urlName[query_params.innerView];
      query = query_params.innerviewValue;
    }
    renderEditorView(current_view, editor_pane, result_pane, query);
  }
+0 −14
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ FnordMetric.util.parseQueryString = function(qstr) {
  } else {
    path = qstr;
  }
  console.log(query_params);
  return {
    "path": path,
    "query_params": query_params
@@ -84,21 +83,8 @@ FnordMetric.util.setURLQueryString = function(hash, query_params, encode, push_s
    path += 
      "&" + param +
      "=" + query_params[param];
    console.log(param);
    console.log(query_params[param]);
  }

  console.log("path " + path);

  /*for (var i in query_params) {
    path += 
      query_params[i].name + "=";
    path += (encode) ? 
      encodeURIComponent(query_params[i].value) :
      query_params[i].value;
    path += (i == query_params.length -1) ? "" : "&";
  }*/

  if (push_state) {
    window.history.pushState({url:path}, "#", path);
  }