Fixed action handling for the details overlay; Moved settings access to template;

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -13,8 +13,11 @@ templates._pre = function(content)
   return ["pre", content, "class", "mono"];
 };
 
-templates.details = function(entry, do_raw, do_wrap)
+templates.details = function(entry)
 {
+  var settings = window.settings["network-detail-overlay"];
+  var do_raw = settings.get("view-raw");
+  var do_wrap = settings.get("wrap-detail-view");
   return (
     ["div",
       this._details_headline(entry),
@@ -102,8 +105,8 @@ templates._request = function(request, is_last, do_raw)
   // is not shown in network-details. It will mostly mean it was retried internally
   // and didn't go on the network.
   var is_relevant = is_last && request.was_responded_to;
-
-  var expanded = window.settings["network-detail-overlay"].get("expand-requests");
+  var settings = window.settings["network-detail-overlay"];
+  var expanded = settings.get("expand-requests");
   var show_headline = is_relevant;
   var show_headers = is_relevant && expanded;
   var show_body = show_headers;
@@ -117,7 +120,8 @@ templates._request = function(request, is_last, do_raw)
 
 templates._response = function(response, is_last, do_raw)
 {
-  var expanded = window.settings["network-detail-overlay"].get("expand-responses");
+  var settings = window.settings["network-detail-overlay"];
+  var expanded = settings.get("expand-responses");
   var show_headline = response.logger_entry_touched_network;
   var show_headers = expanded && response.logger_entry_touched_network;
   var show_body = expanded;

src/network/network_view.js

@@ -59,6 +59,7 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
     }
     else
     {
+      this._overlay.hide();
       this._render_click_to_fetch_view(this._container);
     }
 
@@ -289,7 +290,7 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
     }
   };
 
-  var _make_selection_func = function(accessor)
+  var selection_func = function(accessor)
   {
     if (this.selected)
     {
@@ -447,6 +448,17 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
     this.update();
   }.bind(this);
 
+  this._close_detail_overlay_bound = function(evt, target)
+  {
+    if (this.selected)
+    {
+      this.selected = null;
+      this.needs_instant_update = true;
+      this.update();
+      return false;
+    }
+  }.bind(this);
+
   this._on_setting_changed_bound = function(message)
   {
     switch (message.id)
@@ -598,8 +610,9 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
 
   ActionHandlerInterface.apply(this);
   this._handlers = {
-    "select-next-entry": _make_selection_func.bind(this, "nextElementSibling"),
-    "select-previous-entry": _make_selection_func.bind(this, "previousElementSibling")
+    "select-next-entry": selection_func.bind(this, "nextElementSibling"),
+    "select-previous-entry": selection_func.bind(this, "previousElementSibling"),
+    "close-details": this._close_detail_overlay_bound
   };
   this.id = id;
   ActionBroker.get_instance().register_handler(this);
@@ -616,6 +629,7 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
                                                                          "network-details-view scroll",
                                                                          null,
                                                                          "network-detail-overlay"));
+  this._overlay.shared_shortcuts = this.id;
   cls.NetworkDetailOverlayView.create_ui_widgets();
 
   this._type_filters = ["all"].map(this._map_filter_bound);
@@ -829,11 +843,7 @@ cls.NetworkDetailOverlayViewPrototype = function()
 
   this._render_details_view = function(entry)
   {
-    var do_raw = settings["network-detail-overlay"].get("view-raw");
-    var do_wrap = settings["network-detail-overlay"].get("wrap-detail-view");
-    // todo: not consistent to read some settings from within the template,
-    // but annoying to pass them over 8 trillion functions.
-    return templates.network.details(entry, do_raw, do_wrap);
+    return templates.network.details(entry);
   };
 
   this._on_toggle_expand_request_response = function(event)
@@ -872,6 +882,17 @@ cls.NetworkDetailOverlayViewPrototype = function()
     eh.scroll["network-detail-overlay"] = this._on_scroll.bind(this);
     eh.click["toggle-expand-request-response"] = this._on_toggle_expand_request_response.bind(this);
 
+    ActionHandlerInterface.apply(this);
+    this.handle = function(action_id, event, target)
+    {
+      var parent_view = window.views[this.parent_view_id];
+      if (parent_view)
+        parent_view.handle.apply(parent_view, arguments);
+
+    }
+    this.id = id;
+    ActionBroker.get_instance().register_handler(this);
+
     this.init(id, container_class, html, default_handler);
   }
 }

src/scripts/ini.js

@@ -208,7 +208,7 @@
         }
       },
       "network_logger": {
-        "details":
+        "default":
         {
           "escape": "close-details",
           "up": "select-previous-entry",
@@ -426,7 +426,7 @@
         }
       },
       "network_logger": {
-        "details":
+        "default":
         {
           "escape": "close-details",
           "up": "select-previous-entry",