<!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>[183329] 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/183329">183329</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:19:35 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove Reload and Download Web Archive buttons from FrameTreeElement
https://bugs.webkit.org/show_bug.cgi?id=144064
The will be global toolbar items soon.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/FrameTreeElement.js:
* UserInterface/Views/ResourceTreeElement.js:
(WebInspector.ResourceTreeElement.prototype._updateStatus):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.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 (183328 => 183329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:19:08 UTC (rev 183328)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:19:35 UTC (rev 183329)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-04-22 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Remove Reload and Download Web Archive buttons from FrameTreeElement
+ https://bugs.webkit.org/show_bug.cgi?id=144064
+
+ The will be global toolbar items soon.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/FrameTreeElement.js:
+ * UserInterface/Views/ResourceTreeElement.js:
+ (WebInspector.ResourceTreeElement.prototype._updateStatus):
+
+2015-04-22 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Remove time and weight from the dashboard
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144063
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js (183328 => 183329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2015-04-26 01:19:08 UTC (rev 183328)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameTreeElement.js 2015-04-26 01:19:35 UTC (rev 183329)
</span><span class="lines">@@ -135,23 +135,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><del>-
- if (this._frame.isMainFrame()) {
- WebInspector.notifications.addEventListener(WebInspector.Notification.PageArchiveStarted, this._pageArchiveStarted, this);
- WebInspector.notifications.addEventListener(WebInspector.Notification.PageArchiveEnded, this._pageArchiveEnded, this);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>- ondetach()
- {
- WebInspector.ResourceTreeElement.prototype.ondetach.call(this);
-
- if (this._frame.isMainFrame()) {
- WebInspector.notifications.removeEventListener(WebInspector.Notification.PageArchiveStarted, this._pageArchiveStarted, this);
- WebInspector.notifications.removeEventListener(WebInspector.Notification.PageArchiveEnded, this._pageArchiveEnded, this);
- }
- }
-
</del><span class="cx"> // Overrides from FolderizedTreeElement (Protected).
</span><span class="cx">
</span><span class="cx"> compareChildTreeElements(a, b)
</span><span class="lines">@@ -175,52 +160,6 @@
</span><span class="cx"> return aIsResource ? 1 : -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Called from ResourceTreeElement.
-
- updateStatusForMainFrame()
- {
- function loadedImages()
- {
- if (!this._reloadButton || !this._downloadButton)
- return;
-
- var fragment = document.createDocumentFragment("div");
- fragment.appendChild(this._downloadButton.element);
- fragment.appendChild(this._reloadButton.element);
- this.status = fragment;
-
- delete this._loadingMainFrameButtons;
- }
-
- if (this._reloadButton && this._downloadButton) {
- loadedImages.call(this);
- return;
- }
-
- if (!this._loadingMainFrameButtons) {
- this._loadingMainFrameButtons = true;
-
- var tooltip;
- if (WebInspector.debuggableType === WebInspector.DebuggableType.JavaScript)
- tooltip = WebInspector.UIString("Restart (%s)").format(WebInspector._reloadPageKeyboardShortcut.displayName);
- else
- tooltip = WebInspector.UIString("Reload page (%s)\nReload ignoring cache (%s)").format(WebInspector._reloadPageKeyboardShortcut.displayName, WebInspector._reloadPageIgnoringCacheKeyboardShortcut.displayName);
-
- wrappedSVGDocument(platformImagePath("Reload.svg"), null, tooltip, function(element) {
- this._reloadButton = new WebInspector.TreeElementStatusButton(element);
- this._reloadButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._reloadPageClicked, this);
- loadedImages.call(this);
- }.bind(this));
-
- wrappedSVGDocument(platformImagePath("DownloadArrow.svg"), null, WebInspector.UIString("Download Web Archive"), function(element) {
- this._downloadButton = new WebInspector.TreeElementStatusButton(element);
- this._downloadButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._downloadButtonClicked, this);
- this._updateDownloadButton();
- loadedImages.call(this);
- }.bind(this));
- }
- }
-
</del><span class="cx"> // Overrides from TreeElement (Private).
</span><span class="cx">
</span><span class="cx"> onpopulate()
</span><span class="lines">@@ -288,9 +227,6 @@
</span><span class="cx"> // shouldRefreshChildren will call onpopulate if expanded is true.
</span><span class="cx"> this._updateExpandedSetting();
</span><span class="cx">
</span><del>- if (this._frame.isMainFrame())
- this._updateDownloadButton();
-
</del><span class="cx"> this.shouldRefreshChildren = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,46 +265,4 @@
</span><span class="cx"> if (this.expanded)
</span><span class="cx"> this._frame.domTree.requestContentFlowList();
</span><span class="cx"> }
</span><del>-
- _reloadPageClicked(event)
- {
- // Ignore cache when the shift key is pressed.
- PageAgent.reload(event.data.shiftKey);
- }
-
- _downloadButtonClicked(event)
- {
- WebInspector.archiveMainFrame();
- }
-
- _updateDownloadButton()
- {
- console.assert(this._frame.isMainFrame());
- if (!this._downloadButton)
- return;
-
- if (!PageAgent.archive || WebInspector.debuggableType !== WebInspector.DebuggableType.Web) {
- this._downloadButton.hidden = true;
- return;
- }
-
- if (this._downloadingPage) {
- this._downloadButton.enabled = false;
- return;
- }
-
- this._downloadButton.enabled = WebInspector.canArchiveMainFrame();
- }
-
- _pageArchiveStarted(event)
- {
- this._downloadingPage = true;
- this._updateDownloadButton();
- }
-
- _pageArchiveEnded(event)
- {
- this._downloadingPage = false;
- this._updateDownloadButton();
- }
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (183328 => 183329)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-04-26 01:19:08 UTC (rev 183328)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2015-04-26 01:19:35 UTC (rev 183329)
</span><span class="lines">@@ -160,12 +160,8 @@
</span><span class="cx"> this.removeClassName(WebInspector.ResourceTreeElement.FailedStyleClassName);
</span><span class="cx">
</span><span class="cx"> if (this._resource.finished || this._resource.failed) {
</span><del>- // Remove the spinner and replace with a reload button in case it's the main frame's main resource.
- var frame = this._resource.parentFrame;
- if (this._resource.isMainResource() && frame && frame.isMainFrame() && this instanceof WebInspector.FrameTreeElement)
- this.updateStatusForMainFrame();
- else
- this.status = "";
</del><ins>+ // Remove the spinner.
+ this.status = "";
</ins><span class="cx"> } else {
</span><span class="cx"> var spinner = new WebInspector.IndeterminateProgressSpinner;
</span><span class="cx"> this.status = spinner.element;
</span></span></pre>
</div>
</div>
</body>
</html>