Changeset 244576 in webkit

Timestamp:

Apr 23, 2019, 6:20:32 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Network: support drag/drop for importing
​https://bugs.webkit.org/show_bug.cgi?id=197221

Reviewed by Timothy Hatcher.

• UserInterface/Views/NetworkTabContentView.js:

(WI.NetworkTabContentView.prototype.async.handleFileDrop): Added.

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.prototype.processHAR): Added.
(WI.NetworkTableContentView.prototype._importHAR):

• UserInterface/Base/FileUtilities.js:

(WI.FileUtilities.async readText):
Only await if the result is a Promise.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/FileUtilities.js (modified) (1 diff)
• UserInterface/Views/NetworkTabContentView.js (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-23  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Network: support drag/drop for importing
+        https://bugs.webkit.org/show_bug.cgi?id=197221
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/NetworkTabContentView.js:
+        (WI.NetworkTabContentView.prototype.async.handleFileDrop): Added.
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.processHAR): Added.
+        (WI.NetworkTableContentView.prototype._importHAR):
+
+        * UserInterface/Base/FileUtilities.js:
+        (WI.FileUtilities.async readText):
+        Only `await` if the result is a `Promise`.
+
 2019-04-23  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/FileUtilities.js

@@ -145 +145 @@
 
             let promise = callback(result);
-            if (promise)
+            if (promise instanceof Promise)
                 await promise;
         }

trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js

@@ -84 +84 @@
     }
 
+    async handleFileDrop(files)
+    {
+        await WI.FileUtilities.readJSON(files, (result) => this._networkTableContentView.processHAR(result));
+    }
+
     // Public
 

trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

@@ -1243 +1243 @@
     }
 
+    processHAR(result)
+    {
+        let resources = WI.networkManager.processHAR(result);
+        if (!resources)
+            return;
+
+        let importedCollection = this._addCollection();
+
+        let displayName = WI.UIString("Imported - %s").format(result.filename);
+        this._addCollectionPathComponent(importedCollection, displayName, "network-har-icon");
+
+        this._changeCollection(importedCollection);
+
+        for (let resource of resources)
+            this._insertResourceAndReloadTable(resource);
+    }
+
     handleClearShortcut(event)
     {
@@ -2136 +2153 @@
     _importHAR()
     {
-        WI.FileUtilities.importJSON((result) => {
-            let resources = WI.networkManager.processHAR(result);
-            if (!resources)
-                return;
-
-            let importedCollection = this._addCollection();
-
-            let displayName = WI.UIString("Imported - %s").format(result.filename);
-            this._addCollectionPathComponent(importedCollection, displayName, "network-har-icon");
-
-            this._changeCollection(importedCollection);
-
-            for (let resource of resources)
-                this._insertResourceAndReloadTable(resource);
-        });
+        WI.FileUtilities.importJSON((result) => this.processHAR(result));
     }