<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204862] trunk/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204862">204862</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 15:23:26 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: resource tree elements should provide "Download File" context menu items
https://bugs.webkit.org/show_bug.cgi?id=158035
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-08-23
Reviewed by Joseph Pecoraro.
Add a context menu item to elements representing resources that
initiates a download of that resource.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Base/Main.js:
(WebInspector.saveDataToFile):
Add support for saving base64 objects.
* UserInterface/Base/MIMETypeUtilities.js:
(WebInspector.fileExtensionForMIMEType):
Returns a file extension for the given MIME type if able.
* UserInterface/Views/FrameTreeElement.js:
(WebInspector.FrameTreeElement.prototype.onattach):
Add contextmenu event listener since superclass onattach call is explicitly not used.
* UserInterface/Views/ResourceTimelineDataGridNode.js:
(WebInspector.ResourceTimelineDataGridNode.prototype.appendContextMenuItems):
Add Save File context menu item.
* UserInterface/Views/ResourceTreeElement.js:
(WebInspector.ResourceTreeElement.prototype.onattach):
(WebInspector.ResourceTreeElement.prototype._handleContextMenuEvent):
Add contextmenu event listener and Save File context menu item.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMIMETypeUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2016-08-23 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><ins>+ Web Inspector: resource tree elements should provide "Download File" context menu items
+ https://bugs.webkit.org/show_bug.cgi?id=158035
+
+ Reviewed by Joseph Pecoraro.
+
+ Add a context menu item to elements representing resources that
+ initiates a download of that resource.
+
+ * Localizations/en.lproj/localizedStrings.js:
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.saveDataToFile):
+ Add support for saving base64 objects.
+
+ * UserInterface/Base/MIMETypeUtilities.js:
+ (WebInspector.fileExtensionForMIMEType):
+ Returns a file extension for the given MIME type if able.
+
+ * UserInterface/Views/FrameTreeElement.js:
+ (WebInspector.FrameTreeElement.prototype.onattach):
+ Add contextmenu event listener since superclass onattach call is explicitly not used.
+
+ * UserInterface/Views/ResourceTimelineDataGridNode.js:
+ (WebInspector.ResourceTimelineDataGridNode.prototype.appendContextMenuItems):
+ Add Save File context menu item.
+
+ * UserInterface/Views/ResourceTreeElement.js:
+ (WebInspector.ResourceTreeElement.prototype.onattach):
+ (WebInspector.ResourceTreeElement.prototype._handleContextMenuEvent):
+ Add contextmenu event listener and Save File context menu item.
+
+2016-08-23 Devin Rousso <dcrousso+webkit@gmail.com>
+
</ins><span class="cx"> Web Inspector: No open/copy src resource in context menu
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159028
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -613,6 +613,7 @@
</span><span class="cx"> localizedStrings["Role"] = "Role";
</span><span class="cx"> localizedStrings["Rule"] = "Rule";
</span><span class="cx"> localizedStrings["Samples"] = "Samples";
</span><ins>+localizedStrings["Save File"] = "Save File";
</ins><span class="cx"> localizedStrings["Save configuration"] = "Save configuration";
</span><span class="cx"> localizedStrings["Scheme"] = "Scheme";
</span><span class="cx"> localizedStrings["Scope"] = "Scope";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMIMETypeUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/MIMETypeUtilities.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -78,3 +78,47 @@
</span><span class="cx">
</span><span class="cx"> return extensionToMIMEType[extension] || null;
</span><span class="cx"> };
</span><ins>+
+WebInspector.fileExtensionForMIMEType = function(mimeType)
+{
+ const mimeTypeToExtension = {
+ // Document types.
+ "text/html": "html",
+ "application/xhtml+xml": "xhtml",
+ "text/xml": "xml",
+
+ // Script types.
+ "text/javascript": "js",
+ "application/json": "json",
+ "text/x-clojure": "clj",
+ "text/x-coffeescript": "coffee",
+ "text/x-livescript": "ls",
+ "text/typescript": "ts",
+
+ // Stylesheet types.
+ "text/css": "css",
+ "text/x-less": "less",
+ "text/x-sass": "sass",
+ "text/x-scss": "scss",
+
+ // Image types.
+ "image/bmp": "bmp",
+ "image/gif": "gif",
+ "image/jpeg": "jpeg",
+ "image/jpeg": "jpg",
+ "application/pdf": "pdf",
+ "image/png": "png",
+ "image/tiff": "tif",
+ "image/tiff": "tiff",
+
+ // Font types and Media types are ignored for now.
+
+ // Miscellaneous types.
+ "image/svg+xml": "svg",
+ "text/plain": "txt",
+ "text/xsl": "xsl",
+ };
+
+ let extension = mimeTypeToExtension[mimeType];
+ return extension ? `.${extension}` : null;
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -806,11 +806,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> console.assert(saveData.url);
</span><del>- console.assert(typeof saveData.content === "string");
- if (!saveData.url || typeof saveData.content !== "string")
</del><ins>+ console.assert(saveData.content);
+ if (!saveData.url || !saveData.content)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- InspectorFrontendHost.save(saveData.url, saveData.content, false, forceSaveAs || saveData.forceSaveAs);
</del><ins>+ let suggestedName = parseURL(saveData.url).lastPathComponent;
+ if (!suggestedName) {
+ suggestedName = WebInspector.UIString("Untitled");
+ let dataURLTypeMatch = /^data:([^;]+)/.exec(saveData.url);
+ if (dataURLTypeMatch)
+ suggestedName += WebInspector.fileExtensionForMIMEType(dataURLTypeMatch[1]) || "";
+ }
+
+ if (typeof saveData.content === "string") {
+ const base64Encoded = false;
+ InspectorFrontendHost.save(suggestedName, saveData.content, base64Encoded, forceSaveAs || saveData.forceSaveAs);
+ return;
+ }
+
+ let fileReader = new FileReader;
+ fileReader.readAsDataURL(saveData.content);
+ fileReader.addEventListener("loadend", () => {
+ let dataURLComponents = parseDataURL(fileReader.result);
+
+ const base64Encoded = true;
+ InspectorFrontendHost.save(suggestedName, dataURLComponents.data, base64Encoded, forceSaveAs || saveData.forceSaveAs);
+ });
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.isConsoleFocused = function()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -142,6 +142,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Immediate superclasses are skipped, since Frames handle their own SourceMapResources.
</span><span class="cx"> WebInspector.GeneralTreeElement.prototype.onattach.call(this);
</span><ins>+
+ this.element.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Overrides from FolderizedTreeElement (Protected).
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTimelineDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimelineDataGridNode.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -148,6 +148,15 @@
</span><span class="cx">
</span><span class="cx"> appendContextMenuItems(contextMenu)
</span><span class="cx"> {
</span><ins>+ contextMenu.appendItem(WebInspector.UIString("Save File"), () => {
+ this._resource.requestContent().then(() => {
+ WebInspector.saveDataToFile({
+ url: this._resource.url,
+ content: this._resource.content
+ });
+ });
+ });
+
</ins><span class="cx"> if (this._resource.urlComponents.scheme !== "data")
</span><span class="cx"> contextMenu.appendItem(WebInspector.UIString("Copy as cURL"), () => { this._resource.generateCURLCommand(); });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (204861 => 204862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2016-08-23 22:16:46 UTC (rev 204861)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2016-08-23 22:23:26 UTC (rev 204862)
</span><span class="lines">@@ -87,6 +87,13 @@
</span><span class="cx"> return {text: [urlComponents.lastPathComponent, urlComponents.path, this._resource.url]};
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ onattach()
+ {
+ super.onattach();
+
+ this.element.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this));
+ }
+
</ins><span class="cx"> ondblclick()
</span><span class="cx"> {
</span><span class="cx"> InspectorFrontendHost.openInNewTab(this._resource.url);
</span><span class="lines">@@ -151,6 +158,20 @@
</span><span class="cx"> this.callFirstAncestorFunction("descendantResourceTreeElementMainTitleDidChange", [this, oldMainTitle]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleContextMenuEvent(event)
+ {
+ let contextMenu = WebInspector.ContextMenu.createFromEvent(event);
+
+ contextMenu.appendItem(WebInspector.UIString("Save File"), () => {
+ this._resource.requestContent().then(() => {
+ WebInspector.saveDataToFile({
+ url: this._resource.url,
+ content: this._resource.content
+ });
+ });
+ });
+ }
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _updateStatus()
</span></span></pre>
</div>
</div>
</body>
</html>