Removed the button to switch raw view; Replaced it by a context menu entry. Added back the first border in multipart requests, even for parsed mode.

Author: Daniel Herzog

src/network/network_details_templates.js

@@ -45,6 +45,8 @@ templates.details = function(entry, left_val, do_raw)
         this._details_content(entry, do_raw),
         "data-object-id", String(entry.id),
         "class", "entry-details"
+        // Todo: currently can't have the setting-changing context menu only on this container
+        // ,"data-menu", "network-logger-details"
       ],
     "class", "network-details-container",
     "style", "left:" + left_val + "px"]
@@ -357,10 +359,11 @@ templates._request_body = function(req, do_raw)
   if (req.request_body.partList.length) // Multipart
   {
     var use_raw_boundary = Boolean(do_raw && req.boundary);
+    var boundary = use_raw_boundary ? req.boundary : ["hr"];
     for (var n = 0, part; part = req.request_body.partList[n]; n++)
     {
-      if (use_raw_boundary && n === 0)
-        ret.push(this._pre(req.boundary, HTTP_BOUNDARY_CLASS));
+      if (n === 0)
+        ret.push(this._pre(boundary, HTTP_BOUNDARY_CLASS));
 
       ret.extend(this.headers_list(part.headerList, do_raw));
       ret.push(this._pre("\n"));
@@ -369,7 +372,6 @@ templates._request_body = function(req, do_raw)
       else
         ret.push(["p", ui_strings.S_NETWORK_N_BYTE_BODY.replace("%s", part.contentLength)]);
 
-      var boundary = use_raw_boundary ? req.boundary : ["hr"];
       if (use_raw_boundary && part === req.request_body.partList.last)
         boundary += "--\n";
 

src/network/network_view.js

@@ -650,6 +650,15 @@ cls.NetworkLogView = function(id, name, container_class, html, default_handler,
     }
   }.bind(this);
 
+/*
+  // Todo: currently can't have the setting-changing context menu only on this container
+  this._on_toggle_raw_mode_bound = function(event)
+  {
+    var KEY = "view-raw";
+    settings.network_logger.set(KEY, !settings.network_logger.get(KEY));
+  }.bind(this);
+*/
+
   var eh = window.eventHandlers;
 
   eh.click["select-network-request"] = this._on_clicked_request_bound;
@@ -720,7 +729,8 @@ cls.NetworkLog.create_ui_widgets = function()
     },
     // settings map
     {
-      checkboxes: ["track-content", "view-raw"]
+      checkboxes: ["track-content", "view-raw"],
+      contextmenu: ["view-raw"]
     },
     // templates
     {
@@ -821,15 +831,6 @@ cls.NetworkLog.create_ui_widgets = function()
           ],
           handler: "profiler-mode-switch"
         },
-        {
-          type: UI.TYPE_SWITCH,
-          items: [
-            {
-              key: "network_logger.view-raw",
-              icon: "view-raw-requests-responses"
-            }
-          ]
-        },
         {
           type: UI.TYPE_INPUT,
           items: [

src/ui-images/icons/icon_raw_headers.png

@@ -432,11 +432,6 @@ cst-select-option-list,
   background-image: url("../ui-images/icons/icon_network_profiler.png");
 }
 
-.network_logger\.view-raw::before
-{
-  background-image: url("../ui-images/icons/icon_raw_headers.png");
-}
-
 .profiler-start-stop::before
 {
   background-image: url("../ui-images/icons/icon_record.png");