Changeset 252200 in webkit

Timestamp:

Nov 7, 2019 12:17:59 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Local Resource Overrides: automatically show a file picker when attempting to create an override for non-text resources
​https://bugs.webkit.org/show_bug.cgi?id=203917

Reviewed by Timothy Hatcher.

Since there's no way to edit non-text resources (e.g. images, fonts, etc.) in Web Inspector,
when creating a local override for non-text resources, default to showing a file picker and
creating a local override from the content and MIME type of whatever file is chosen.

Still provide a way (shift-click) to create a local override for non-text resources from the
resource's contents, as that can be useful if the user just wants to change some headers.

• UserInterface/Models/Resource.js:

(WI.Resource.prototype.async createLocalResourceOverride):

• UserInterface/Views/ResourceContentView.js:

(WI.ResourceContentView):
(WI.ResourceContentView.prototype.get createLocalResourceOverrideTooltip): Added.
(WI.ResourceContentView.prototype.requestLocalResourceOverrideInitialContent): Added.
(WI.ResourceContentView.prototype.async _getContentForLocalResourceOverrideFromFile): Added.
(WI.ResourceContentView.prototype._handleCreateLocalResourceOverride):
(WI.ResourceContentView.prototype._handleImportLocalResourceOverride):
(WI.ResourceContentView.prototype.localResourceOverrideInitialContent): Deleted.
(WI.ResourceContentView.prototype.async _handleCreateLocalResourceOverride): Deleted.

• UserInterface/Views/TextResourceContentView.js:

(WI.TextResourceContentView.prototype.get createLocalResourceOverrideTooltip): Added.
(WI.TextResourceContentView.prototype.requestLocalResourceOverrideInitialContent): Added.
(WI.TextResourceContentView.prototype.localResourceOverrideInitialContent): Deleted.

• Localizations/en.lproj/localizedStrings.js:

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (1 diff)
• UserInterface/Models/Resource.js (modified) (2 diffs)
• UserInterface/Views/ResourceContentView.js (modified) (4 diffs)
• UserInterface/Views/TextResourceContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-11-07  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Local Resource Overrides: automatically show a file picker when attempting to create an override for non-text resources
+        https://bugs.webkit.org/show_bug.cgi?id=203917
+
+        Reviewed by Timothy Hatcher.
+
+        Since there's no way to edit non-text resources (e.g. images, fonts, etc.) in Web Inspector,
+        when creating a local override for non-text resources, default to showing a file picker and
+        creating a local override from the content and MIME type of whatever file is chosen.
+
+        Still provide a way (shift-click) to create a local override for non-text resources from the
+        resource's contents, as that can be useful if the user just wants to change some headers.
+
+        * UserInterface/Models/Resource.js:
+        (WI.Resource.prototype.async createLocalResourceOverride):
+
+        * UserInterface/Views/ResourceContentView.js:
+        (WI.ResourceContentView):
+        (WI.ResourceContentView.prototype.get createLocalResourceOverrideTooltip): Added.
+        (WI.ResourceContentView.prototype.requestLocalResourceOverrideInitialContent): Added.
+        (WI.ResourceContentView.prototype.async _getContentForLocalResourceOverrideFromFile): Added.
+        (WI.ResourceContentView.prototype._handleCreateLocalResourceOverride):
+        (WI.ResourceContentView.prototype._handleImportLocalResourceOverride):
+        (WI.ResourceContentView.prototype.localResourceOverrideInitialContent): Deleted.
+        (WI.ResourceContentView.prototype.async _handleCreateLocalResourceOverride): Deleted.
+
+        * UserInterface/Views/TextResourceContentView.js:
+        (WI.TextResourceContentView.prototype.get createLocalResourceOverrideTooltip): Added.
+        (WI.TextResourceContentView.prototype.requestLocalResourceOverrideInitialContent): Added.
+        (WI.TextResourceContentView.prototype.localResourceOverrideInitialContent): Deleted.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
 2019-11-07  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -251 +251 @@
 localizedStrings["Click Listener"] = "Click Listener";
 localizedStrings["Click to close this tab"] = "Click to close this tab";
+localizedStrings["Click to create a Local Override from this content"] = "Click to create a Local Override from this content";
+localizedStrings["Click to import a file and create a Local Override\nShift-click to create a Local Override from this content"] = "Click to import a file and create a Local Override\nShift-click to create a Local Override from this content";
 localizedStrings["Click to select a color\nShift-click to switch color formats"] = "Click to select a color\nShift-click to switch color formats";
 localizedStrings["Click to view variable value\nShift-click to replace variable with value"] = "Click to view variable value\nShift-click to replace variable with value";

trunk/Source/WebInspectorUI/UserInterface/Models/Resource.js

@@ -1059 +1059 @@
     }
 
-    async createLocalResourceOverride({initialContent} = {})
+    async createLocalResourceOverride({initialMIMEType, initialBase64Encoded, initialContent} = {})
     {
         console.assert(!this.isLocalResourceOverride);
@@ -1065 +1065 @@
 
         let {rawContent, rawBase64Encoded} = await this.requestContent();
-        let content = initialContent !== undefined ? initialContent : rawContent;
 
         return WI.LocalResourceOverride.create({
             url: this.url,
-            mimeType: this.mimeType,
-            content,
-            base64Encoded: rawBase64Encoded,
+            mimeType: initialMIMEType !== undefined ? initialMIMEType : this.mimeType,
+            content: initialContent !== undefined ? initialContent : rawContent,
+            base64Encoded: initialBase64Encoded !== undefined ? initialBase64Encoded : rawBase64Encoded,
             statusCode: this.statusCode,
             statusText: this.statusText,

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

@@ -78 +78 @@
                 this._localResourceOverrideBannerView = new WI.LocalResourceOverrideWarningView(resource);
 
-                this._createLocalResourceOverrideButtonNavigationItem = new WI.ButtonNavigationItem("create-local-resource-override", WI.UIString("Create Local Override"), "Images/NavigationItemNetworkOverride.svg", 13, 14);
+                this._createLocalResourceOverrideButtonNavigationItem = new WI.ButtonNavigationItem("create-local-resource-override", this.createLocalResourceOverrideTooltip, "Images/NavigationItemNetworkOverride.svg", 13, 14);
                 this._createLocalResourceOverrideButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._handleCreateLocalResourceOverride, this);
                 this._createLocalResourceOverrideButtonNavigationItem.enabled = false; // Enabled when the content is available.
@@ -123 +123 @@
     }
 
-    localResourceOverrideInitialContent()
-    {
-        // Implemented by subclasses if needed.
-        return {};
+    get createLocalResourceOverrideTooltip()
+    {
+        return WI.UIString("Click to import a file and create a Local Override\nShift-click to create a Local Override from this content");
+    }
+
+    requestLocalResourceOverrideInitialContent(callback)
+    {
+        // Overridden by subclasses if needed.
+
+        WI.FileUtilities.import(async (fileList) => {
+            console.assert(fileList.length === 1);
+
+            this._getContentForLocalResourceOverrideFromFile(fileList[0], ({mimeType, base64Encoded, content}) => {
+                callback({
+                    initialMIMEType: mimeType,
+                    initialBase64Encoded: base64Encoded,
+                    initialContent: content,
+                });
+            });
+        });
     }
 
@@ -231 +247 @@
     }
 
-    async _handleCreateLocalResourceOverride(event)
-    {
-        let initialContent = this.localResourceOverrideInitialContent();
-        let localResourceOverride = await this._resource.createLocalResourceOverride(initialContent);
-        WI.networkManager.addLocalResourceOverride(localResourceOverride);
-        WI.showLocalResourceOverride(localResourceOverride);
+    async _getContentForLocalResourceOverrideFromFile(file, callback)
+    {
+        let initialMIMEType = file.type || WI.mimeTypeForFileExtension(WI.fileExtensionForFilename(file.name));
+        if (WI.shouldTreatMIMETypeAsText(initialMIMEType)) {
+            await WI.FileUtilities.readText(file, async ({text}) => {
+                await callback({
+                    mimeType: initialMIMEType,
+                    base64Encoded: false,
+                    content: text,
+                });
+            });
+        } else {
+            await WI.FileUtilities.readData(file, async ({mimeType, base64Encoded, content}) => {
+                await callback({mimeType, base64Encoded, content});
+            });
+        }
+    }
+
+    _handleCreateLocalResourceOverride(event)
+    {
+        let {nativeEvent} = event.data;
+
+        let createLocalResourceOverride = async (initialContent) => {
+            let localResourceOverride = await this._resource.createLocalResourceOverride(initialContent);
+            WI.networkManager.addLocalResourceOverride(localResourceOverride);
+            WI.showLocalResourceOverride(localResourceOverride);
+        };
+
+        if (nativeEvent.shiftKey)
+            createLocalResourceOverride({});
+        else
+            this.requestLocalResourceOverrideInitialContent(createLocalResourceOverride);
     }
 
@@ -250 +292 @@
 
             let revision = localResourceOverride.localResource.currentRevision;
-
-            let file = fileList[0];
-            let mimeType = file.type || WI.mimeTypeForFileExtension(WI.fileExtensionForFilename(file.name));
-            if (WI.shouldTreatMIMETypeAsText(mimeType)) {
-                await WI.FileUtilities.readText(file, ({text}) => {
-                    revision.updateRevisionContent(text, {base64Encoded: false, mimeType});
-                });
-            } else {
-                await WI.FileUtilities.readData(file, ({dataURL, mimeType, base64Encoded, content}) => {
-                    revision.updateRevisionContent(content, {base64Encoded, mimeType});
-                });
-            }
+            await this._getContentForLocalResourceOverrideFromFile(fileList[0], ({mimeType, base64Encoded, content}) => {
+                revision.updateRevisionContent(content, {base64Encoded, mimeType});
+            });
 
             if (!this.showingLocalResourceOverride)

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

@@ -145 +145 @@
     }
 
-    localResourceOverrideInitialContent()
-    {
-        return {initialContent: this._textEditor.string};
+    get createLocalResourceOverrideTooltip()
+    {
+        return WI.UIString("Click to create a Local Override from this content");
+    }
+
+    requestLocalResourceOverrideInitialContent(callback)
+    {
+        callback({initialContent: this._textEditor.string});
     }