Changeset 139886 in webkit

Timestamp:

Jan 16, 2013 8:54:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Show formatted content of JSON request
​https://bugs.webkit.org/show_bug.cgi?id=106900

Patch by Sergey Ryazanov <​serya@chromium.org> on 2013-01-16
Reviewed by Vsevolod Vlasov.

"Request payload" section showed raw content for POST requests.
This change show it in structured format if it's JSON parsable.
Raw format is also available.

• inspector/front-end/RequestHeadersView.js:

(WebInspector.RequestHeadersView.prototype._refreshQueryString):
(WebInspector.RequestHeadersView.prototype._refreshFormData):
(WebInspector.RequestHeadersView.prototype.toggleViewSource):
(WebInspector.RequestHeadersView.prototype._refreshParams):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/RequestHeadersView.js (modified) (4 diffs)
• inspector/front-end/networkPanel.css (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Sergey Ryazanov  <serya@chromium.org>
+
+        Web Inspector: Show formatted content of JSON request
+        https://bugs.webkit.org/show_bug.cgi?id=106900
+
+        Reviewed by Vsevolod Vlasov.
+
+        "Request payload" section showed raw content for POST requests.
+        This change show it in structured format if it's JSON parsable.
+        Raw format is also available.
+
+        * inspector/front-end/RequestHeadersView.js:
+        (WebInspector.RequestHeadersView.prototype._refreshQueryString):
+        (WebInspector.RequestHeadersView.prototype._refreshFormData):
+        (WebInspector.RequestHeadersView.prototype.toggleViewSource):
+        (WebInspector.RequestHeadersView.prototype._refreshParams):
+
 2013-01-16  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/RequestHeadersView.js

@@ -140 +140 @@
                 try {
                     value = decodeURIComponent(value);
-                } catch(e) {
+                } catch (e) {
                     errorDecoding = true;
                 }
@@ -203 +203 @@
         } else {
             this._requestPayloadTreeElement.hidden = false;
-            this._populateTreeElementWithSourceText(this._requestPayloadTreeElement, formData)
+            try {
+                var json = JSON.parse(formData);
+                this._refreshRequestJSONPayload(json, formData, false);
+            } catch (e) {
+                this._populateTreeElementWithSourceText(this._requestPayloadTreeElement, formData);
+            }
         }
     },
@@ -240 +245 @@
         }
 
-        var viewSourceToggleTitle = paramsTreeElement._viewSource ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
-        var viewSourceToggleButton = this._createToggleButton(viewSourceToggleTitle);
-        viewSourceToggleButton.addEventListener("click", toggleViewSource.bind(this));
-        paramsTreeElement.listItemElement.appendChild(viewSourceToggleButton);
+        paramsTreeElement.listItemElement.appendChild(this._createViewSourceToggle(paramsTreeElement._viewSource, toggleViewSource.bind(this)));
         
         if (paramsTreeElement._viewSource) {
@@ -266 +268 @@
             paramsTreeElement.appendChild(parmTreeElement);
         }
+    },
+
+    /**
+     * @param {Object} parsedObject
+     * @param {string} sourceText
+     * @param {boolean} viewSource
+     */
+    _refreshRequestJSONPayload: function(parsedObject, sourceText, viewSource)
+    {
+        this._requestPayloadTreeElement.removeChildren();
+
+        var listItem = this._requestPayloadTreeElement.listItemElement;
+        listItem.removeChildren();
+        listItem.appendChild(document.createTextNode(this._requestPayloadTreeElement.title));
+
+        var setViewSource = this._refreshRequestJSONPayload.bind(this, parsedObject, sourceText);
+
+        if (viewSource) {
+            listItem.appendChild(this._createViewSourceToggle(true, setViewSource.bind(this, false)));
+            this._populateTreeElementWithSourceText(this._requestPayloadTreeElement, sourceText);
+        } else {
+            listItem.appendChild(this._createViewSourceToggle(false, setViewSource.bind(this, true)));
+            var object = WebInspector.RemoteObject.fromLocalObject(parsedObject);
+            var section = new WebInspector.ObjectPropertiesSection(object, object.description);
+            section.expand();
+            section.editable = false;
+            listItem.appendChild(section.element);
+        }
+    },
+
+    /**
+     * @param {boolean} viewSource
+     * @param {Function} handler
+     */
+    _createViewSourceToggle: function(viewSource, handler)
+    {
+        var viewSourceToggleTitle = viewSource ? WebInspector.UIString("view parsed") : WebInspector.UIString("view source");
+        var viewSourceToggleButton = this._createToggleButton(viewSourceToggleTitle);
+        viewSourceToggleButton.addEventListener("click", handler);
+        return viewSourceToggleButton;
     },
 

trunk/Source/WebCore/inspector/front-end/networkPanel.css

@@ -147 +147 @@
 }
 
+.resource-headers-view .outline-disclosure .parent .section * {
+    font-weight: normal;
+}
+
 .resource-headers-view .outline-disclosure .children li {
     white-space: nowrap;