<!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>[187967] 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/187967">187967</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2015-08-05 11:12:35 -0700 (Wed, 05 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Convert remaining ContentViews to use ES6 classes
https://bugs.webkit.org/show_bug.cgi?id=147534
Reviewed by Joseph Pecoraro.
Along the way, inline a few style class names.
Elided mechanical changes from the Changelog.
* UserInterface/Views/ApplicationCacheFrameContentView.js:
* UserInterface/Views/ClusterContentView.js:
* UserInterface/Views/ConsoleTabContentView.js:
* UserInterface/Views/ContentBrowserTabContentView.js: Rearrange initialization
of the tab's content browser to comply with TDZ rules for using `this`.
* UserInterface/Views/ContentFlowDOMTreeContentView.js:
* UserInterface/Views/ContentView.js:
* UserInterface/Views/ContentViewContainer.js:
* UserInterface/Views/CookieStorageContentView.js:
* UserInterface/Views/DOMStorageContentView.js:
* UserInterface/Views/DOMTreeContentView.js:
* UserInterface/Views/DatabaseContentView.js:
* UserInterface/Views/DatabaseTableContentView.js:
* UserInterface/Views/DebuggerTabContentView.js:
* UserInterface/Views/ElementsTabContentView.js:
* UserInterface/Views/FontResourceContentView.js:
* UserInterface/Views/FrameDOMTreeContentView.js:
* UserInterface/Views/GenericResourceContentView.js:
* UserInterface/Views/ImageResourceContentView.js:
* UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
* UserInterface/Views/LogContentView.js:
* UserInterface/Views/NetworkGridContentView.js:
* UserInterface/Views/NetworkTabContentView.js:
* UserInterface/Views/NewTabContentView.js:
* UserInterface/Views/ResourceClusterContentView.js:
* UserInterface/Views/ResourceContentView.js:
* UserInterface/Views/ResourcesTabContentView.js:
* UserInterface/Views/ScriptContentView.js:
* UserInterface/Views/SearchTabContentView.js:
* UserInterface/Views/SettingsTabContentView.js:
* UserInterface/Views/StorageTabContentView.js:
* UserInterface/Views/TabContentView.js:
* UserInterface/Views/TextContentView.js:
* UserInterface/Views/TextResourceContentView.js:
* UserInterface/Views/TimelineRecordingContentView.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsClusterContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsConsoleTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentFlowDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentFlowDOMTreeContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDatabaseContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsElementsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFrameDOMTreeContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/FrameDOMTreeContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsGenericResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/GenericResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsImageResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNewTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceClusterContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourcesTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSearchTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsStorageTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/StorageTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2015-08-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: Convert remaining ContentViews to use ES6 classes
+ https://bugs.webkit.org/show_bug.cgi?id=147534
+
+ Reviewed by Joseph Pecoraro.
+
+ Along the way, inline a few style class names.
+
+ Elided mechanical changes from the Changelog.
+
+ * UserInterface/Views/ApplicationCacheFrameContentView.js:
+ * UserInterface/Views/ClusterContentView.js:
+ * UserInterface/Views/ConsoleTabContentView.js:
+ * UserInterface/Views/ContentBrowserTabContentView.js: Rearrange initialization
+ of the tab's content browser to comply with TDZ rules for using `this`.
+ * UserInterface/Views/ContentFlowDOMTreeContentView.js:
+ * UserInterface/Views/ContentView.js:
+ * UserInterface/Views/ContentViewContainer.js:
+ * UserInterface/Views/CookieStorageContentView.js:
+ * UserInterface/Views/DOMStorageContentView.js:
+ * UserInterface/Views/DOMTreeContentView.js:
+ * UserInterface/Views/DatabaseContentView.js:
+ * UserInterface/Views/DatabaseTableContentView.js:
+ * UserInterface/Views/DebuggerTabContentView.js:
+ * UserInterface/Views/ElementsTabContentView.js:
+ * UserInterface/Views/FontResourceContentView.js:
+ * UserInterface/Views/FrameDOMTreeContentView.js:
+ * UserInterface/Views/GenericResourceContentView.js:
+ * UserInterface/Views/ImageResourceContentView.js:
+ * UserInterface/Views/IndexedDatabaseObjectStoreContentView.js:
+ * UserInterface/Views/LogContentView.js:
+ * UserInterface/Views/NetworkGridContentView.js:
+ * UserInterface/Views/NetworkTabContentView.js:
+ * UserInterface/Views/NewTabContentView.js:
+ * UserInterface/Views/ResourceClusterContentView.js:
+ * UserInterface/Views/ResourceContentView.js:
+ * UserInterface/Views/ResourcesTabContentView.js:
+ * UserInterface/Views/ScriptContentView.js:
+ * UserInterface/Views/SearchTabContentView.js:
+ * UserInterface/Views/SettingsTabContentView.js:
+ * UserInterface/Views/StorageTabContentView.js:
+ * UserInterface/Views/TabContentView.js:
+ * UserInterface/Views/TextContentView.js:
+ * UserInterface/Views/TextResourceContentView.js:
+ * UserInterface/Views/TimelineRecordingContentView.js:
+
</ins><span class="cx"> 2015-08-05 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Allow users to duplicate rules in the Rules sidebar panel
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,76 +23,75 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ApplicationCacheFrameContentView = function(representedObject)
</del><ins>+WebInspector.ApplicationCacheFrameContentView = class ApplicationCacheFrameContentView extends WebInspector.ApplicationCacheFrame
</ins><span class="cx"> {
</span><del>- console.assert(representedObject instanceof WebInspector.ApplicationCacheFrame);
</del><ins>+ constructor(representedObject)
+ {
+ console.assert(representedObject instanceof WebInspector.ApplicationCacheFrame);
</ins><span class="cx">
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ super(representedObject);
</ins><span class="cx">
</span><del>- this.element.classList.add("application-cache-frame", "table");
</del><ins>+ this.element.classList.add("application-cache-frame", "table");
</ins><span class="cx">
</span><del>- this._frame = representedObject.frame;
</del><ins>+ this._frame = representedObject.frame;
</ins><span class="cx">
</span><del>- this._emptyView = WebInspector.createMessageTextView(WebInspector.UIString("No Application Cache information available"), false);
- this._emptyView.classList.add("hidden");
- this.element.appendChild(this._emptyView);
</del><ins>+ this._emptyView = WebInspector.createMessageTextView(WebInspector.UIString("No Application Cache information available"), false);
+ this._emptyView.classList.add("hidden");
+ this.element.appendChild(this._emptyView);
</ins><span class="cx">
</span><del>- this._markDirty();
</del><ins>+ this._markDirty();
</ins><span class="cx">
</span><del>- var status = representedObject.status;
- this.updateStatus(status);
</del><ins>+ var status = representedObject.status;
+ this.updateStatus(status);
</ins><span class="cx">
</span><del>- WebInspector.applicationCacheManager.addEventListener(WebInspector.ApplicationCacheManager.Event.FrameManifestStatusChanged, this._updateStatus, this);
-}
</del><ins>+ WebInspector.applicationCacheManager.addEventListener(WebInspector.ApplicationCacheManager.Event.FrameManifestStatusChanged, this._updateStatus, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ApplicationCacheFrameContentView.prototype = {
- constructor: WebInspector.ApplicationCacheFrameContentView,
-
- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._maybeUpdate();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.applicationCacheManager.removeEventListener(null, null, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this.dataGrid)
</span><span class="cx"> this.dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.ApplicationCache;
</span><span class="cx"> cookie.frame = this.representedObject.frame.url;
</span><span class="cx"> cookie.manifest = this.representedObject.manifest.manifestURL;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid)
</span><span class="cx"> return [];
</span><span class="cx"> return [this._dataGrid.scrollContainer];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _maybeUpdate: function()
</del><ins>+ _maybeUpdate()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible || !this._viewDirty)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._update();
</span><span class="cx"> this._viewDirty = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _markDirty: function()
</del><ins>+ _markDirty()
</ins><span class="cx"> {
</span><span class="cx"> this._viewDirty = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateStatus: function(event)
</del><ins>+ _updateStatus(event)
</ins><span class="cx"> {
</span><span class="cx"> var frameManifest = event.data.frameManifest;
</span><span class="cx"> if (frameManifest !== this.representedObject)
</span><span class="lines">@@ -101,9 +100,9 @@
</span><span class="cx"> console.assert(frameManifest instanceof WebInspector.ApplicationCacheFrame);
</span><span class="cx">
</span><span class="cx"> this.updateStatus(frameManifest.status);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateStatus: function(status)
</del><ins>+ updateStatus(status)
</ins><span class="cx"> {
</span><span class="cx"> var oldStatus = this._status;
</span><span class="cx"> this._status = status;
</span><span class="lines">@@ -112,14 +111,14 @@
</span><span class="cx"> this._markDirty();
</span><span class="cx">
</span><span class="cx"> this._maybeUpdate();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _update: function()
</del><ins>+ _update()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.applicationCacheManager.requestApplicationCache(this._frame, this._updateCallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateCallback: function(applicationCache)
</del><ins>+ _updateCallback(applicationCache)
</ins><span class="cx"> {
</span><span class="cx"> if (!applicationCache || !applicationCache.manifestURL) {
</span><span class="cx"> delete this._manifest;
</span><span class="lines">@@ -150,9 +149,9 @@
</span><span class="cx"> this._dataGrid.element.classList.remove("hidden");
</span><span class="cx">
</span><span class="cx"> this._emptyView.classList.add("hidden");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _createDataGrid: function()
</del><ins>+ _createDataGrid()
</ins><span class="cx"> {
</span><span class="cx"> var columns = {url: {}, type: {}, size: {}};
</span><span class="cx">
</span><span class="lines">@@ -174,9 +173,9 @@
</span><span class="cx">
</span><span class="cx"> this.element.appendChild(this._dataGrid.element);
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sortDataGrid: function()
</del><ins>+ _sortDataGrid()
</ins><span class="cx"> {
</span><span class="cx"> function numberCompare(columnIdentifier, nodeA, nodeB)
</span><span class="cx"> {
</span><span class="lines">@@ -196,9 +195,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._dataGrid.sortNodes(comparator);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _populateDataGrid: function()
</del><ins>+ _populateDataGrid()
</ins><span class="cx"> {
</span><span class="cx"> this._dataGrid.removeChildren();
</span><span class="cx">
</span><span class="lines">@@ -211,23 +210,21 @@
</span><span class="cx"> var node = new WebInspector.DataGridNode(data);
</span><span class="cx"> this._dataGrid.appendChild(node);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _deleteButtonClicked: function(event)
</del><ins>+ _deleteButtonClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid || !this._dataGrid.selectedNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Delete Button semantics are not yet defined. (Delete a single, or all?)
</span><span class="cx"> this._deleteCallback(this._dataGrid.selectedNode);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _deleteCallback: function(node)
</del><ins>+ _deleteCallback(node)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Should we delete a single (selected) resource or all resources?
</span><span class="cx"> // InspectorBackend.deleteCachedResource(...)
</span><span class="cx"> // this._update();
</span><span class="cx"> }
</span><del>-}
-
-WebInspector.ApplicationCacheFrameContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del><ins>+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsClusterContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ClusterContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,125 +23,124 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ClusterContentView = function(representedObject)
</del><ins>+WebInspector.ClusterContentView = class className extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this.element.classList.add("cluster");
</del><ins>+ this.element.classList.add("cluster");
</ins><span class="cx">
</span><del>- this._contentViewContainer = new WebInspector.ContentViewContainer();
- this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
- this.element.appendChild(this._contentViewContainer.element);
</del><ins>+ this._contentViewContainer = new WebInspector.ContentViewContainer();
+ this._contentViewContainer.addEventListener(WebInspector.ContentViewContainer.Event.CurrentContentViewDidChange, this._currentContentViewDidChange, this);
+ this.element.appendChild(this._contentViewContainer.element);
</ins><span class="cx">
</span><del>- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange, this._contentViewSupplementalRepresentedObjectsDidChange, this);
- WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange, this._contentViewNumberOfSearchResultsDidChange, this);
-};
</del><ins>+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._contentViewSelectionPathComponentDidChange, this);
+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange, this._contentViewSupplementalRepresentedObjectsDidChange, this);
+ WebInspector.ContentView.addEventListener(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange, this._contentViewNumberOfSearchResultsDidChange, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ClusterContentView.prototype = {
- constructor: WebInspector.ClusterContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> return currentContentView ? currentContentView.navigationItems : [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get contentViewContainer()
</span><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSplitContentBrowser()
</span><span class="cx"> {
</span><span class="cx"> if (this._contentViewContainer.currentContentView)
</span><span class="cx"> return this._contentViewContainer.currentContentView.supportsSplitContentBrowser;
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> if (currentContentView)
</span><span class="cx"> currentContentView.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.hidden();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.closeAllContentViews();
</span><span class="cx">
</span><span class="cx"> WebInspector.ContentView.removeEventListener(null, null, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoBack: function()
</del><ins>+ canGoBack()
</ins><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer.canGoBack();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoForward: function()
</del><ins>+ canGoForward()
</ins><span class="cx"> {
</span><span class="cx"> return this._contentViewContainer.canGoForward();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goBack: function()
</del><ins>+ goBack()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.goBack();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goForward: function()
</del><ins>+ goForward()
</ins><span class="cx"> {
</span><span class="cx"> this._contentViewContainer.goForward();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="cx"> if (!this._contentViewContainer.currentContentView)
</span><span class="cx"> return [];
</span><span class="cx"> return this._contentViewContainer.currentContentView.selectionPathComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supplementalRepresentedObjects()
</span><span class="cx"> {
</span><span class="cx"> if (!this._contentViewContainer.currentContentView)
</span><span class="cx"> return [];
</span><span class="cx"> return this._contentViewContainer.currentContentView.supplementalRepresentedObjects;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get handleCopyEvent()
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> return currentContentView && typeof currentContentView.handleCopyEvent === "function" ? currentContentView.handleCopyEvent.bind(currentContentView) : null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> return currentContentView && currentContentView.supportsSave;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> return currentContentView && currentContentView.saveData || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> // Always return true so we can intercept the search query to resend it when switching content views.
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="lines">@@ -149,7 +148,7 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return null;
</span><span class="cx"> return currentContentView.numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="lines">@@ -157,7 +156,7 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return false;
</span><span class="cx"> return currentContentView.hasPerformedSearch;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="lines">@@ -165,9 +164,9 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx"> currentContentView.automaticallyRevealFirstSearchResult = reveal;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> this._searchQuery = query;
</span><span class="cx">
</span><span class="lines">@@ -175,9 +174,9 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx"> currentContentView.performSearch(query);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> this._searchQuery = null;
</span><span class="cx">
</span><span class="lines">@@ -185,35 +184,35 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx"> currentContentView.searchCleared();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchQueryWithSelection: function()
</del><ins>+ searchQueryWithSelection()
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return null;
</span><span class="cx"> return currentContentView.searchQueryWithSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx"> currentContentView.revealPreviousSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSearch)
</span><span class="cx"> return;
</span><span class="cx"> currentContentView.revealNextSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _currentContentViewDidChange: function(event)
</del><ins>+ _currentContentViewDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentViewContainer.currentContentView;
</span><span class="cx"> if (currentContentView && currentContentView.supportsSearch) {
</span><span class="lines">@@ -226,28 +225,26 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NavigationItemsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewSelectionPathComponentDidChange: function(event)
</del><ins>+ _contentViewSelectionPathComponentDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this._contentViewContainer.currentContentView)
</span><span class="cx"> return;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewSupplementalRepresentedObjectsDidChange: function(event)
</del><ins>+ _contentViewSupplementalRepresentedObjectsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this._contentViewContainer.currentContentView)
</span><span class="cx"> return;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentViewNumberOfSearchResultsDidChange: function(event)
</del><ins>+ _contentViewNumberOfSearchResultsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target !== this._contentViewContainer.currentContentView)
</span><span class="cx"> return;
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ClusterContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsConsoleTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,27 +23,25 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ConsoleTabContentView = function(identifier)
</del><ins>+WebInspector.ConsoleTabContentView = class ConsoleTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Console.svg", WebInspector.UIString("Console"));
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Console.svg", WebInspector.UIString("Console"));
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "console", "console", tabBarItem, null, null, true);
-};
</del><ins>+ super(identifier || "console", "console", tabBarItem, null, null, true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ConsoleTabContentView.prototype = {
- constructor: WebInspector.ConsoleTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.ConsoleTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentBrowserTabContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> if (this.contentBrowser.currentContentView === WebInspector.consoleContentView)
</span><span class="cx"> return;
</span><span class="lines">@@ -56,20 +54,20 @@
</span><span class="cx"> this.contentBrowser.showContentView(WebInspector.consoleContentView);
</span><span class="cx">
</span><span class="cx"> console.assert(this.contentBrowser.currentContentView === WebInspector.consoleContentView);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showRepresentedObject: function(representedObject, cookie)
</del><ins>+ showRepresentedObject(representedObject, cookie)
</ins><span class="cx"> {
</span><span class="cx"> // Do nothing. The shown function will handle things. Calling
</span><span class="cx"> // ContentBrowserTabContentView.shown will cause a new LogContentView
</span><span class="cx"> // to be created instead of reusing WebInspector.consoleContentView.
</span><span class="cx"> console.assert(representedObject instanceof WebInspector.LogObject);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.LogObject;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSplitContentBrowser()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,94 +23,95 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentBrowserTabContentView = function(identifier, styleClassNames, tabBarItem, navigationSidebarPanelClass, detailsSidebarPanels, disableBackForward)
</del><ins>+WebInspector.ContentBrowserTabContentView = class ContentBrowserTabContentView extends WebInspector.TabContentView
</ins><span class="cx"> {
</span><del>- if (typeof styleClassNames === "string")
- styleClassNames = [styleClassNames];
</del><ins>+ constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanelClass, detailsSidebarPanels, disableBackForward)
+ {
+ if (typeof styleClassNames === "string")
+ styleClassNames = [styleClassNames];
</ins><span class="cx">
</span><del>- styleClassNames.push("content-browser");
</del><ins>+ styleClassNames.push("content-browser");
</ins><span class="cx">
</span><del>- var contentBrowser = new WebInspector.ContentBrowser(null, this, disableBackForward);
- var navigationSidebarPanel = navigationSidebarPanelClass ? new navigationSidebarPanelClass(contentBrowser) : null;
</del><ins>+ var contentBrowser = new WebInspector.ContentBrowser(null, null, disableBackForward);
+ var navigationSidebarPanel = navigationSidebarPanelClass ? new navigationSidebarPanelClass(contentBrowser) : null;
</ins><span class="cx">
</span><del>- WebInspector.TabContentView.call(this, identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanels);
</del><ins>+ super(identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanels);
</ins><span class="cx">
</span><del>- this._lastSelectedDetailsSidebarPanelSetting = new WebInspector.Setting(identifier + "-last-selected-details-sidebar-panel", null);
</del><ins>+ this._contentBrowser = contentBrowser;
+ this._contentBrowser.delegate = this;
</ins><span class="cx">
</span><del>- this._contentBrowser = contentBrowser;
- this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this.showDetailsSidebarPanels, this);
- this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
</del><ins>+ this._lastSelectedDetailsSidebarPanelSetting = new WebInspector.Setting(identifier + "-last-selected-details-sidebar-panel", null);
</ins><span class="cx">
</span><del>- // If any content views were shown during sidebar construction, contentBrowserTreeElementForRepresentedObject() would have returned null.
- // Explicitly update the path for the navigation bar to prevent it from showing up as blank.
- this._contentBrowser.updateHierarchicalPathForCurrentContentView();
</del><ins>+ this._contentBrowser = this._contentBrowser;
+ this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this.showDetailsSidebarPanels, this);
+ this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
</ins><span class="cx">
</span><del>- if (navigationSidebarPanel) {
- var showToolTip = WebInspector.UIString("Show the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
- var hideToolTip = WebInspector.UIString("Hide the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
</del><ins>+ // If any content views were shown during sidebar construction, contentBrowserTreeElementForRepresentedObject() would have returned null.
+ // Explicitly update the path for the navigation bar to prevent it from showing up as blank.
+ this._contentBrowser.updateHierarchicalPathForCurrentContentView();
</ins><span class="cx">
</span><del>- this._showNavigationSidebarItem = new WebInspector.ActivateButtonNavigationItem("toggle-navigation-sidebar", showToolTip, hideToolTip, "Images/ToggleLeftSidebar.svg", 16, 16);
- this._showNavigationSidebarItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, WebInspector.toggleNavigationSidebar, WebInspector);
- this._showNavigationSidebarItem.activated = !WebInspector.navigationSidebar.collapsed;
</del><ins>+ if (navigationSidebarPanel) {
+ var showToolTip = WebInspector.UIString("Show the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
+ var hideToolTip = WebInspector.UIString("Hide the navigation sidebar (%s)").format(WebInspector.navigationSidebarKeyboardShortcut.displayName);
</ins><span class="cx">
</span><del>- this._contentBrowser.navigationBar.insertNavigationItem(this._showNavigationSidebarItem, 0);
- this._contentBrowser.navigationBar.insertNavigationItem(new WebInspector.DividerNavigationItem, 1);
</del><ins>+ this._showNavigationSidebarItem = new WebInspector.ActivateButtonNavigationItem("toggle-navigation-sidebar", showToolTip, hideToolTip, "Images/ToggleLeftSidebar.svg", 16, 16);
+ this._showNavigationSidebarItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, WebInspector.toggleNavigationSidebar, WebInspector);
+ this._showNavigationSidebarItem.activated = !WebInspector.navigationSidebar.collapsed;
</ins><span class="cx">
</span><del>- navigationSidebarPanel.contentBrowser = this._contentBrowser;
</del><ins>+ this._contentBrowser.navigationBar.insertNavigationItem(this._showNavigationSidebarItem, 0);
+ this._contentBrowser.navigationBar.insertNavigationItem(new WebInspector.DividerNavigationItem, 1);
</ins><span class="cx">
</span><del>- WebInspector.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._navigationSidebarCollapsedStateDidChange, this);
- }
</del><ins>+ navigationSidebarPanel.contentBrowser = this._contentBrowser;
</ins><span class="cx">
</span><del>- if (detailsSidebarPanels && detailsSidebarPanels.length) {
- var showToolTip = WebInspector.UIString("Show the details sidebar (%s)").format(WebInspector.detailsSidebarKeyboardShortcut.displayName);
- var hideToolTip = WebInspector.UIString("Hide the details sidebar (%s)").format(WebInspector.detailsSidebarKeyboardShortcut.displayName);
</del><ins>+ WebInspector.navigationSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._navigationSidebarCollapsedStateDidChange, this);
+ }
</ins><span class="cx">
</span><del>- this._showDetailsSidebarItem = new WebInspector.ActivateButtonNavigationItem("toggle-details-sidebar", showToolTip, hideToolTip, "Images/ToggleRightSidebar.svg", 16, 16);
- this._showDetailsSidebarItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, WebInspector.toggleDetailsSidebar, WebInspector);
- this._showDetailsSidebarItem.activated = !WebInspector.detailsSidebar.collapsed;
- this._showDetailsSidebarItem.enabled = false;
</del><ins>+ if (detailsSidebarPanels && detailsSidebarPanels.length) {
+ var showToolTip = WebInspector.UIString("Show the details sidebar (%s)").format(WebInspector.detailsSidebarKeyboardShortcut.displayName);
+ var hideToolTip = WebInspector.UIString("Hide the details sidebar (%s)").format(WebInspector.detailsSidebarKeyboardShortcut.displayName);
</ins><span class="cx">
</span><del>- this._contentBrowser.navigationBar.addNavigationItem(new WebInspector.DividerNavigationItem);
- this._contentBrowser.navigationBar.addNavigationItem(this._showDetailsSidebarItem);
</del><ins>+ this._showDetailsSidebarItem = new WebInspector.ActivateButtonNavigationItem("toggle-details-sidebar", showToolTip, hideToolTip, "Images/ToggleRightSidebar.svg", 16, 16);
+ this._showDetailsSidebarItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, WebInspector.toggleDetailsSidebar, WebInspector);
+ this._showDetailsSidebarItem.activated = !WebInspector.detailsSidebar.collapsed;
+ this._showDetailsSidebarItem.enabled = false;
</ins><span class="cx">
</span><del>- WebInspector.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._detailsSidebarCollapsedStateDidChange, this);
- WebInspector.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._detailsSidebarPanelSelected, this);
- }
</del><ins>+ this._contentBrowser.navigationBar.addNavigationItem(new WebInspector.DividerNavigationItem);
+ this._contentBrowser.navigationBar.addNavigationItem(this._showDetailsSidebarItem);
</ins><span class="cx">
</span><del>- this.element.appendChild(this._contentBrowser.element);
-};
</del><ins>+ WebInspector.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._detailsSidebarCollapsedStateDidChange, this);
+ WebInspector.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._detailsSidebarPanelSelected, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ContentBrowserTabContentView.prototype = {
- constructor: WebInspector.ContentBrowserTabContentView,
- __proto__: WebInspector.TabContentView.prototype,
</del><ins>+ this.element.appendChild(this._contentBrowser.element);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get contentBrowser()
</span><span class="cx"> {
</span><span class="cx"> return this._contentBrowser;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.TabContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> this._contentBrowser.shown();
</span><span class="cx">
</span><span class="cx"> if (this.navigationSidebarPanel && !this._contentBrowser.currentContentView)
</span><span class="cx"> this.navigationSidebarPanel.showDefaultContentView();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><del>- WebInspector.TabContentView.prototype.hidden.call(this);
</del><ins>+ super.hidden();
</ins><span class="cx">
</span><span class="cx"> this._contentBrowser.hidden();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><del>- WebInspector.TabContentView.prototype.closed.call(this);
</del><ins>+ super.closed();
</ins><span class="cx">
</span><span class="cx"> WebInspector.navigationSidebar.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.detailsSidebar.removeEventListener(null, null, this);
</span><span class="lines">@@ -119,21 +120,21 @@
</span><span class="cx"> this.navigationSidebarPanel.closed();
</span><span class="cx">
</span><span class="cx"> this._contentBrowser.contentViewContainer.closeAllContentViews();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><del>- WebInspector.TabContentView.prototype.updateLayout.call(this);
</del><ins>+ super.updateLayout();
</ins><span class="cx">
</span><span class="cx"> this._contentBrowser.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get managesDetailsSidebarPanels()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showDetailsSidebarPanels: function()
</del><ins>+ showDetailsSidebarPanels()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -183,32 +184,32 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showRepresentedObject: function(representedObject, cookie)
</del><ins>+ showRepresentedObject(representedObject, cookie)
</ins><span class="cx"> {
</span><span class="cx"> if (this.navigationSidebarPanel)
</span><span class="cx"> this.navigationSidebarPanel.cancelRestoringState();
</span><span class="cx"> this.contentBrowser.showContentViewForRepresentedObject(representedObject, cookie);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // ContentBrowser Delegate
</span><span class="cx">
</span><del>- contentBrowserTreeElementForRepresentedObject: function(contentBrowser, representedObject)
</del><ins>+ contentBrowserTreeElementForRepresentedObject(contentBrowser, representedObject)
</ins><span class="cx"> {
</span><span class="cx"> if (this.navigationSidebarPanel)
</span><span class="cx"> return this.navigationSidebarPanel.treeElementForRepresentedObject(representedObject);
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _navigationSidebarCollapsedStateDidChange: function(event)
</del><ins>+ _navigationSidebarCollapsedStateDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showNavigationSidebarItem.activated = !WebInspector.navigationSidebar.collapsed;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _detailsSidebarCollapsedStateDidChange: function(event)
</del><ins>+ _detailsSidebarCollapsedStateDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -220,9 +221,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.detailsSidebarCollapsedSetting.value = WebInspector.detailsSidebar.collapsed;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _detailsSidebarPanelSelected: function(event)
</del><ins>+ _detailsSidebarPanelSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -234,18 +235,18 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._lastSelectedDetailsSidebarPanelSetting.value = WebInspector.detailsSidebar.selectedSidebarPanel.identifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentBrowserCurrentContentViewDidChange: function(event)
</del><ins>+ _contentBrowserCurrentContentViewDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentBrowser.currentContentView;
</span><span class="cx"> if (!currentContentView)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._revealAndSelectRepresentedObjectInNavigationSidebar(currentContentView.representedObject);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _revealAndSelectRepresentedObjectInNavigationSidebar: function(representedObject)
</del><ins>+ _revealAndSelectRepresentedObjectInNavigationSidebar(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> if (!this.navigationSidebarPanel)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentFlowDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentFlowDOMTreeContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentFlowDOMTreeContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentFlowDOMTreeContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
</span><ins>+ * Copyright (C) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,41 +28,39 @@
</span><span class="cx"> * SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentFlowDOMTreeContentView = function(contentFlow)
</del><ins>+WebInspector.ContentFlowDOMTreeContentView = class ContentFlowDOMTreeContentView extends WebInspector.DOMTreeContentView
</ins><span class="cx"> {
</span><del>- console.assert(contentFlow);
</del><ins>+ constructor(contentFlow)
+ {
+ console.assert(contentFlow instanceof WebInspector.ContentFlow, contentFlow);
</ins><span class="cx">
</span><del>- WebInspector.DOMTreeContentView.call(this, contentFlow);
</del><ins>+ super(contentFlow);
</ins><span class="cx">
</span><del>- contentFlow.addEventListener(WebInspector.ContentFlow.Event.ContentNodeWasAdded, this._contentNodeWasAdded, this);
- contentFlow.addEventListener(WebInspector.ContentFlow.Event.ContentNodeWasRemoved, this._contentNodeWasRemoved, this);
</del><ins>+ contentFlow.addEventListener(WebInspector.ContentFlow.Event.ContentNodeWasAdded, this._contentNodeWasAdded, this);
+ contentFlow.addEventListener(WebInspector.ContentFlow.Event.ContentNodeWasRemoved, this._contentNodeWasRemoved, this);
</ins><span class="cx">
</span><del>- this._createContentTrees();
-};
</del><ins>+ this._createContentTrees();
+ }
</ins><span class="cx">
</span><del>-WebInspector.ContentFlowDOMTreeContentView.prototype = {
- constructor: WebInspector.ContentFlowDOMTreeContentView,
- __proto__: WebInspector.DOMTreeContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> this.representedObject.removeEventListener(null, null, this);
</span><span class="cx">
</span><del>- WebInspector.DOMTreeContentView.prototype.closed.call(this);
- },
</del><ins>+ super.closed();
+ }
</ins><span class="cx">
</span><del>- getSearchContextNodes: function(callback)
</del><ins>+ getSearchContextNodes(callback)
</ins><span class="cx"> {
</span><span class="cx"> callback(this.domTreeOutline.children.map(function(treeOutline) {
</span><span class="cx"> return treeOutline.representedObject.id;
</span><span class="cx"> }));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _createContentTrees: function()
</del><ins>+ _createContentTrees()
</ins><span class="cx"> {
</span><span class="cx"> var contentNodes = this.representedObject.contentNodes;
</span><span class="cx"> for (var contentNode of contentNodes)
</span><span class="lines">@@ -69,9 +68,9 @@
</span><span class="cx">
</span><span class="cx"> var documentURL = contentNodes.length ? contentNodes[0].ownerDocument.documentURL : null;
</span><span class="cx"> this._restoreSelectedNodeAfterUpdate(documentURL, contentNodes[0]);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentNodeWasAdded: function(event)
</del><ins>+ _contentNodeWasAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> var treeElement = new WebInspector.DOMTreeElement(event.data.node);
</span><span class="cx"> if (!event.data.before) {
</span><span class="lines">@@ -86,9 +85,9 @@
</span><span class="cx"> console.assert(index !== -1);
</span><span class="cx">
</span><span class="cx"> this.domTreeOutline.insertChild(treeElement, index);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentNodeWasRemoved: function(event)
</del><ins>+ _contentNodeWasRemoved(event)
</ins><span class="cx"> {
</span><span class="cx"> var treeElement = this.domTreeOutline.findTreeElement(event.data.node);
</span><span class="cx"> console.assert(treeElement);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,11 +23,27 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ContentView = function(representedObject, extraArguments)
</del><ins>+WebInspector.ContentView = class ContentView extends WebInspector.Object
</ins><span class="cx"> {
</span><del>- if (this.constructor === WebInspector.ContentView) {
- // When instantiated directly return an instance of a type-based concrete subclass.
</del><ins>+ constructor(representedObject, extraArguments)
+ {
+ // Concrete object instantiation.
+ console.assert(!representedObject || WebInspector.ContentView.isViewable(representedObject), representedObject);
</ins><span class="cx">
</span><ins>+ super();
+
+ this._representedObject = representedObject;
+
+ this._element = document.createElement("div");
+ this._element.classList.add("content-view");
+
+ this._parentContainer = null;
+ }
+
+ // Public
+
+ static createFromRepresentedObject(representedObject, extraArguments)
+ {
</ins><span class="cx"> console.assert(representedObject);
</span><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Frame)
</span><span class="lines">@@ -59,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.Breakpoint) {
</span><span class="cx"> if (representedObject.sourceCodeLocation)
</span><del>- return new WebInspector.ContentView(representedObject.sourceCodeLocation.displaySourceCode, extraArguments);
</del><ins>+ return new WebInspector.ContentView.createFromRepresentedObject(representedObject.sourceCodeLocation.displaySourceCode, extraArguments);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (representedObject instanceof WebInspector.DOMStorageObject)
</span><span class="lines">@@ -119,244 +135,221 @@
</span><span class="cx">
</span><span class="cx"> console.assert(!WebInspector.ContentView.isViewable(representedObject));
</span><span class="cx">
</span><del>- throw "Can't make a ContentView for an unknown representedObject.";
</del><ins>+ throw new Error("Can't make a ContentView for an unknown representedObject.");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Concrete object instantiation.
- console.assert(this.constructor !== WebInspector.ContentView && this instanceof WebInspector.ContentView);
- console.assert(!representedObject || WebInspector.ContentView.isViewable(representedObject));
</del><ins>+ static isViewable(representedObject)
+ {
+ if (representedObject instanceof WebInspector.Frame)
+ return true;
+ if (representedObject instanceof WebInspector.Resource)
+ return true;
+ if (representedObject instanceof WebInspector.Script)
+ return true;
+ if (representedObject instanceof WebInspector.TimelineRecording)
+ return true;
+ if (representedObject instanceof WebInspector.Timeline)
+ return true;
+ if (representedObject instanceof WebInspector.Breakpoint)
+ return representedObject.sourceCodeLocation;
+ if (representedObject instanceof WebInspector.DOMStorageObject)
+ return true;
+ if (representedObject instanceof WebInspector.CookieStorageObject)
+ return true;
+ if (representedObject instanceof WebInspector.DatabaseTableObject)
+ return true;
+ if (representedObject instanceof WebInspector.DatabaseObject)
+ return true;
+ if (representedObject instanceof WebInspector.IndexedDatabaseObjectStore)
+ return true;
+ if (representedObject instanceof WebInspector.IndexedDatabaseObjectStoreIndex)
+ return true;
+ if (representedObject instanceof WebInspector.ApplicationCacheFrame)
+ return true;
+ if (representedObject instanceof WebInspector.DOMTree)
+ return true;
+ if (representedObject instanceof WebInspector.DOMSearchMatchObject)
+ return true;
+ if (representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
+ return true;
+ if (representedObject instanceof WebInspector.LogObject)
+ return true;
+ if (representedObject instanceof WebInspector.ContentFlow)
+ return true;
+ if (typeof representedObject === "string" || representedObject instanceof String)
+ return true;
+ return false;
+ }
</ins><span class="cx">
</span><del>- // FIXME: Convert this to a WebInspector.Object subclass, and call super().
- // WebInspector.Object.call(this);
-
- this._representedObject = representedObject;
-
- this._element = document.createElement("div");
- this._element.classList.add("content-view");
-
- this._parentContainer = null;
-};
-
-// FIXME: Move to a WebInspector.Object subclass and we can remove this.
-WebInspector.Object.deprecatedAddConstructorFunctions(WebInspector.ContentView);
-
-WebInspector.ContentView.isViewable = function(representedObject)
-{
- if (representedObject instanceof WebInspector.Frame)
- return true;
- if (representedObject instanceof WebInspector.Resource)
- return true;
- if (representedObject instanceof WebInspector.Script)
- return true;
- if (representedObject instanceof WebInspector.TimelineRecording)
- return true;
- if (representedObject instanceof WebInspector.Timeline)
- return true;
- if (representedObject instanceof WebInspector.Breakpoint)
- return representedObject.sourceCodeLocation;
- if (representedObject instanceof WebInspector.DOMStorageObject)
- return true;
- if (representedObject instanceof WebInspector.CookieStorageObject)
- return true;
- if (representedObject instanceof WebInspector.DatabaseTableObject)
- return true;
- if (representedObject instanceof WebInspector.DatabaseObject)
- return true;
- if (representedObject instanceof WebInspector.IndexedDatabaseObjectStore)
- return true;
- if (representedObject instanceof WebInspector.IndexedDatabaseObjectStoreIndex)
- return true;
- if (representedObject instanceof WebInspector.ApplicationCacheFrame)
- return true;
- if (representedObject instanceof WebInspector.DOMTree)
- return true;
- if (representedObject instanceof WebInspector.DOMSearchMatchObject)
- return true;
- if (representedObject instanceof WebInspector.SourceCodeSearchMatchObject)
- return true;
- if (representedObject instanceof WebInspector.LogObject)
- return true;
- if (representedObject instanceof WebInspector.ContentFlow)
- return true;
- if (typeof representedObject === "string" || representedObject instanceof String)
- return true;
- return false;
-};
-
-WebInspector.ContentView.Event = {
- SelectionPathComponentsDidChange: "content-view-selection-path-components-did-change",
- SupplementalRepresentedObjectsDidChange: "content-view-supplemental-represented-objects-did-change",
- NumberOfSearchResultsDidChange: "content-view-number-of-search-results-did-change",
- NavigationItemsDidChange: "content-view-navigation-items-did-change"
-};
-
-WebInspector.ContentView.prototype = {
- constructor: WebInspector.ContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get representedObject()
</span><span class="cx"> {
</span><span class="cx"> return this._representedObject;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> // Navigation items that will be displayed by the ContentBrowser instance,
</span><span class="cx"> // meant to be subclassed. Implemented by subclasses.
</span><span class="cx"> return [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get element()
</span><span class="cx"> {
</span><span class="cx"> return this._element;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentContainer()
</span><span class="cx"> {
</span><span class="cx"> return this._parentContainer;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get visible()
</span><span class="cx"> {
</span><span class="cx"> return this._visible;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set visible(flag)
</span><span class="cx"> {
</span><span class="cx"> this._visible = flag;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get shouldKeepElementsScrolledToBottom()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supplementalRepresentedObjects()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSplitContentBrowser()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- restoreFromCookie: function(cookie)
</del><ins>+ restoreFromCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoBack: function()
</del><ins>+ canGoBack()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canGoForward: function()
</del><ins>+ canGoForward()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goBack: function()
</del><ins>+ goBack()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- goForward: function()
</del><ins>+ goForward()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchQueryWithSelection: function()
</del><ins>+ searchQueryWithSelection()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ContentView.prototype.__proto__ = WebInspector.Object.prototype;
</del><ins>+WebInspector.ContentView.Event = {
+ SelectionPathComponentsDidChange: "content-view-selection-path-components-did-change",
+ SupplementalRepresentedObjectsDidChange: "content-view-supplemental-represented-objects-did-change",
+ NumberOfSearchResultsDidChange: "content-view-number-of-search-results-did-change",
+ NavigationItemsDidChange: "content-view-navigation-items-did-change"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentViewContainerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentViewContainer.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="cx"> // No existing content view found, make a new one.
</span><del>- contentView = new WebInspector.ContentView(representedObject, extraArguments);
</del><ins>+ contentView = WebInspector.ContentView.createFromRepresentedObject(representedObject, extraArguments);
</ins><span class="cx">
</span><span class="cx"> console.assert(contentView, "Unknown representedObject", representedObject);
</span><span class="cx"> if (!contentView)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,21 +23,40 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.CookieStorageContentView = function(representedObject)
</del><ins>+WebInspector.CookieStorageContentView = class CookieStorageContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this.element.classList.add("cookie-storage");
</del><ins>+ this.element.classList.add("cookie-storage");
</ins><span class="cx">
</span><del>- this.update();
-};
</del><ins>+ this.update();
+ }
</ins><span class="cx">
</span><del>-WebInspector.CookieStorageContentView.prototype = {
- constructor: WebInspector.CookieStorageContentView,
</del><ins>+ // Static
</ins><span class="cx">
</span><ins>+ static cookieMatchesResourceURL(cookie, resourceURL)
+ {
+ var parsedURL = parseURL(resourceURL);
+ if (!parsedURL || !WebInspector.CookieStorageContentView.cookieDomainMatchesResourceDomain(cookie.domain, parsedURL.host))
+ return false;
+
+ return (parsedURL.path.startsWith(cookie.path)
+ && (!cookie.port || parsedURL.port === cookie.port)
+ && (!cookie.secure || parsedURL.scheme === "https"));
+ }
+
+ static cookieDomainMatchesResourceDomain(cookieDomain, resourceDomain)
+ {
+ if (cookieDomain.charAt(0) !== ".")
+ return resourceDomain === cookieDomain;
+ return !!resourceDomain.match(new RegExp("^([^\\.]+\\.)?" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
+ }
+
</ins><span class="cx"> // Public
</span><span class="cx">
</span><del>- update: function()
</del><ins>+ update()
</ins><span class="cx"> {
</span><span class="cx"> function callback(error, cookies)
</span><span class="cx"> {
</span><span class="lines">@@ -49,30 +68,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageAgent.getCookies(callback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this._dataGrid)
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.CookieStorage;
</span><span class="cx"> cookie.host = this.representedObject.host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid)
</span><span class="cx"> return [];
</span><span class="cx"> return [this._dataGrid.scrollContainer];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _rebuildTable: function()
</del><ins>+ _rebuildTable()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: If there are no cookies, do we want to show an empty datagrid, or do something like the old
</span><span class="cx"> // inspector and show some text saying there are no cookies?
</span><span class="lines">@@ -147,9 +166,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._dataGrid.sortColumnIdentifier = "name";
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _filterCookies: function(cookies)
</del><ins>+ _filterCookies(cookies)
</ins><span class="cx"> {
</span><span class="cx"> var filteredCookies = [];
</span><span class="cx"> var resourcesForDomain = [];
</span><span class="lines">@@ -172,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < cookies.length; ++i) {
</span><span class="cx"> for (var j = 0; j < resourcesForDomain.length; ++j) {
</span><del>- if (WebInspector.cookieMatchesResourceURL(cookies[i], resourcesForDomain[j])) {
</del><ins>+ if (WebInspector.CookieStorageContentView.cookieMatchesResourceURL(cookies[i], resourcesForDomain[j])) {
</ins><span class="cx"> filteredCookies.push(cookies[i]);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -180,9 +199,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return filteredCookies;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sortDataGrid: function()
</del><ins>+ _sortDataGrid()
</ins><span class="cx"> {
</span><span class="cx"> function localeCompare(field, nodeA, nodeB)
</span><span class="cx"> {
</span><span class="lines">@@ -220,9 +239,9 @@
</span><span class="cx">
</span><span class="cx"> console.assert(comparator);
</span><span class="cx"> this._dataGrid.sortNodes(comparator);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _deleteCallback: function(node)
</del><ins>+ _deleteCallback(node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node || !node.cookie)
</span><span class="cx"> return;
</span><span class="lines">@@ -237,26 +256,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.CookieStorageContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
-
-WebInspector.cookieMatchesResourceURL = function(cookie, resourceURL)
-{
- var parsedURL = parseURL(resourceURL);
- if (!parsedURL || !WebInspector.cookieDomainMatchesResourceDomain(cookie.domain, parsedURL.host))
- return false;
-
- return (parsedURL.path.startsWith(cookie.path)
- && (!cookie.port || parsedURL.port === cookie.port)
- && (!cookie.secure || parsedURL.scheme === "https"));
-}
-
-WebInspector.cookieDomainMatchesResourceDomain = function(cookieDomain, resourceDomain)
-{
- if (cookieDomain.charAt(0) !== ".")
- return resourceDomain === cookieDomain;
- return !!resourceDomain.match(new RegExp("^([^\\.]+\\.)?" + cookieDomain.substring(1).escapeForRegExp() + "$"), "i");
-}
-
</del><span class="cx"> WebInspector.CookieType = {
</span><span class="cx"> Request: 0,
</span><span class="cx"> Response: 1
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2013 Samsung Electronics. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -24,64 +24,57 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMStorageContentView = function(representedObject)
</del><ins>+WebInspector.DOMStorageContentView = class DOMStorageContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this.element.classList.add("dom-storage");
</del><ins>+ this.element.classList.add("dom-storage");
</ins><span class="cx">
</span><del>- representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemsCleared, this.itemsCleared, this);
- representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemAdded, this.itemAdded, this);
- representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemRemoved, this.itemRemoved, this);
- representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemUpdated, this.itemUpdated, this);
</del><ins>+ representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemsCleared, this.itemsCleared, this);
+ representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemAdded, this.itemAdded, this);
+ representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemRemoved, this.itemRemoved, this);
+ representedObject.addEventListener(WebInspector.DOMStorageObject.Event.ItemUpdated, this.itemUpdated, this);
</ins><span class="cx">
</span><del>- var columns = {};
- columns.key = {title: WebInspector.UIString("Key"), sortable: true};
- columns.value = {title: WebInspector.UIString("Value"), sortable: true};
</del><ins>+ var columns = {};
+ columns.key = {title: WebInspector.UIString("Key"), sortable: true};
+ columns.value = {title: WebInspector.UIString("Value"), sortable: true};
</ins><span class="cx">
</span><del>- this._dataGrid = new WebInspector.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
- this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
- this._dataGrid.sortColumnIdentifier = "key";
- this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</del><ins>+ this._dataGrid = new WebInspector.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
+ this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
+ this._dataGrid.sortColumnIdentifier = "key";
+ this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</ins><span class="cx">
</span><del>- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.element.appendChild(this._dataGrid.element);
</ins><span class="cx">
</span><del>- this._populate();
-};
</del><ins>+ this._populate();
+ }
</ins><span class="cx">
</span><del>-WebInspector.DOMStorageContentView.DuplicateKeyStyleClassName = "duplicate-key";
-WebInspector.DOMStorageContentView.MissingKeyStyleClassName = "missing-key";
-WebInspector.DOMStorageContentView.MissingValueStyleClassName = "missing-value";
-
-
-WebInspector.DOMStorageContentView.prototype = {
- constructor: WebInspector.DOMStorageContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.DOMStorage;
</span><span class="cx"> cookie.isLocalStorage = this.representedObject.isLocalStorage();
</span><span class="cx"> cookie.host = this.representedObject.host;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemsCleared: function(event)
</del><ins>+ itemsCleared(event)
</ins><span class="cx"> {
</span><span class="cx"> this._dataGrid.removeChildren();
</span><span class="cx"> this._dataGrid.addPlaceholderNode();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemRemoved: function(event)
</del><ins>+ itemRemoved(event)
</ins><span class="cx"> {
</span><span class="cx"> for (var node of this._dataGrid.children) {
</span><span class="cx"> if (node.data.key === event.data.key)
</span><span class="cx"> return this._dataGrid.removeChild(node);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemAdded: function(event)
</del><ins>+ itemAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> var key = event.data.key;
</span><span class="cx"> var value = event.data.value;
</span><span class="lines">@@ -95,9 +88,9 @@
</span><span class="cx"> var data = {key, value};
</span><span class="cx"> this._dataGrid.appendChild(new WebInspector.DataGridNode(data, false));
</span><span class="cx"> this._sortDataGrid();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- itemUpdated: function(event)
</del><ins>+ itemUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> var key = event.data.key;
</span><span class="cx"> var value = event.data.value;
</span><span class="lines">@@ -117,24 +110,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> this._sortDataGrid();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this._dataGrid)
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid)
</span><span class="cx"> return [];
</span><span class="cx"> return [this._dataGrid.scrollContainer];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _populate: function()
</del><ins>+ _populate()
</ins><span class="cx"> {
</span><span class="cx"> this.representedObject.getEntries(function(error, entries) {
</span><span class="cx"> if (error)
</span><span class="lines">@@ -153,9 +146,9 @@
</span><span class="cx"> this._dataGrid.addPlaceholderNode();
</span><span class="cx"> this._dataGrid.updateLayout();
</span><span class="cx"> }.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sortDataGrid: function()
</del><ins>+ _sortDataGrid()
</ins><span class="cx"> {
</span><span class="cx"> var sortColumnIdentifier = this._dataGrid.sortColumnIdentifier || "key";
</span><span class="cx">
</span><span class="lines">@@ -165,18 +158,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._dataGrid.sortNodesImmediately(comparator);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _deleteCallback: function(node)
</del><ins>+ _deleteCallback(node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node || node.isPlaceholderNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._dataGrid.removeChild(node);
</span><span class="cx"> this.representedObject.removeItem(node.data["key"]);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _editingCallback: function(editingNode, columnIdentifier, oldText, newText, moveDirection)
</del><ins>+ _editingCallback(editingNode, columnIdentifier, oldText, newText, moveDirection)
</ins><span class="cx"> {
</span><span class="cx"> var key = editingNode.data["key"].trim().removeWordBreakCharacters();
</span><span class="cx"> var value = editingNode.data["value"].trim().removeWordBreakCharacters();
</span><span class="lines">@@ -270,3 +263,7 @@
</span><span class="cx"> domStorage.setItem(key, value);
</span><span class="cx"> }
</span><span class="cx"> };
</span><ins>+
+WebInspector.DOMStorageContentView.DuplicateKeyStyleClassName = "duplicate-key";
+WebInspector.DOMStorageContentView.MissingKeyStyleClassName = "missing-key";
+WebInspector.DOMStorageContentView.MissingValueStyleClassName = "missing-value";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,91 +23,89 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DOMTreeContentView = function(representedObject)
</del><ins>+WebInspector.DOMTreeContentView = class DOMTreeContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- console.assert(representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ console.assert(representedObject);
</ins><span class="cx">
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ super(representedObject);
</ins><span class="cx">
</span><del>- this._compositingBordersButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("layer-borders", WebInspector.UIString("Show compositing borders"), WebInspector.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13);
- this._compositingBordersButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this);
- this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible;
</del><ins>+ this._compositingBordersButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("layer-borders", WebInspector.UIString("Show compositing borders"), WebInspector.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13);
+ this._compositingBordersButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this);
+ this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible;
</ins><span class="cx">
</span><del>- WebInspector.showPaintRectsSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showPaintRectsSettingChanged, this);
- this._paintFlashingButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("paint-flashing", WebInspector.UIString("Enable paint flashing"), WebInspector.UIString("Disable paint flashing"), "Images/PaintFlashing.svg", 16, 16);
- this._paintFlashingButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this);
- this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects;
- this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WebInspector.showPaintRectsSetting.value;
</del><ins>+ WebInspector.showPaintRectsSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showPaintRectsSettingChanged, this);
+ this._paintFlashingButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("paint-flashing", WebInspector.UIString("Enable paint flashing"), WebInspector.UIString("Disable paint flashing"), "Images/PaintFlashing.svg", 16, 16);
+ this._paintFlashingButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this);
+ this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects;
+ this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WebInspector.showPaintRectsSetting.value;
</ins><span class="cx">
</span><del>- WebInspector.showShadowDOMSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showShadowDOMSettingChanged, this);
- this._showsShadowDOMButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("shows-shadow-DOM", WebInspector.UIString("Show shadow DOM nodes"), WebInspector.UIString("Hide shadow DOM nodes"), "Images/ShadowDOM.svg", 13, 13);
- this._showsShadowDOMButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleShowsShadowDOMSetting, this);
- this._showShadowDOMSettingChanged();
</del><ins>+ WebInspector.showShadowDOMSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showShadowDOMSettingChanged, this);
+ this._showsShadowDOMButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("shows-shadow-DOM", WebInspector.UIString("Show shadow DOM nodes"), WebInspector.UIString("Hide shadow DOM nodes"), "Images/ShadowDOM.svg", 13, 13);
+ this._showsShadowDOMButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleShowsShadowDOMSetting, this);
+ this._showShadowDOMSettingChanged();
</ins><span class="cx">
</span><del>- this.element.classList.add("dom-tree");
- this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
</del><ins>+ this.element.classList.add("dom-tree");
+ this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
</ins><span class="cx">
</span><del>- this._domTreeOutline = new WebInspector.DOMTreeOutline(true, true, true);
- this._domTreeOutline.addEventListener(WebInspector.DOMTreeOutline.Event.SelectedNodeChanged, this._selectedNodeDidChange, this);
- this._domTreeOutline.wireToDomAgent();
- this._domTreeOutline.editable = true;
- this.element.appendChild(this._domTreeOutline.element);
</del><ins>+ this._domTreeOutline = new WebInspector.DOMTreeOutline(true, true, true);
+ this._domTreeOutline.addEventListener(WebInspector.DOMTreeOutline.Event.SelectedNodeChanged, this._selectedNodeDidChange, this);
+ this._domTreeOutline.wireToDomAgent();
+ this._domTreeOutline.editable = true;
+ this.element.appendChild(this._domTreeOutline.element);
</ins><span class="cx">
</span><del>- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeModified, this._domNodeChanged, this);
- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeRemoved, this._domNodeChanged, this);
- WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.CharacterDataModified, this._domNodeChanged, this);
</del><ins>+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeModified, this._domNodeChanged, this);
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.AttributeRemoved, this._domNodeChanged, this);
+ WebInspector.domTreeManager.addEventListener(WebInspector.DOMTreeManager.Event.CharacterDataModified, this._domNodeChanged, this);
</ins><span class="cx">
</span><del>- this._lastSelectedNodePathSetting = new WebInspector.Setting("last-selected-node-path", null);
</del><ins>+ this._lastSelectedNodePathSetting = new WebInspector.Setting("last-selected-node-path", null);
</ins><span class="cx">
</span><del>- this._numberOfSearchResults = null;
-};
</del><ins>+ this._numberOfSearchResults = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.DOMTreeContentView.prototype = {
- constructor: WebInspector.DOMTreeContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._showsShadowDOMButtonNavigationItem, this._compositingBordersButtonNavigationItem, this._paintFlashingButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get domTreeOutline()
</span><span class="cx"> {
</span><span class="cx"> return this._domTreeOutline;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> return [this.element];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._domTreeOutline.updateSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._domTreeOutline.setVisible(true, WebInspector.isConsoleFocused());
</span><span class="cx"> this._updateCompositingBordersButtonToMatchPageSettings();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.domTreeManager.hideDOMNodeHighlight();
</span><span class="cx"> this._domTreeOutline.setVisible(false);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showPaintRectsSetting.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.showShadowDOMSetting.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.domTreeManager.removeEventListener(null, null, this);
</span><span class="cx">
</span><span class="cx"> this._domTreeOutline.close();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="lines">@@ -129,9 +127,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return pathComponents;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- restoreFromCookie: function(cookie)
</del><ins>+ restoreFromCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> if (!cookie || !cookie.nodeToSelect)
</span><span class="cx"> return;
</span><span class="lines">@@ -141,14 +139,14 @@
</span><span class="cx"> // Because nodeToSelect is ephemeral, we don't want to keep
</span><span class="cx"> // it around in the back-forward history entries.
</span><span class="cx"> cookie.nodeToSelect = undefined;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- selectAndRevealDOMNode: function(domNode, preventFocusChange)
</del><ins>+ selectAndRevealDOMNode(domNode, preventFocusChange)
</ins><span class="cx"> {
</span><span class="cx"> this._domTreeOutline.selectDOMNode(domNode, !preventFocusChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- handleCopyEvent: function(event)
</del><ins>+ handleCopyEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> var selectedDOMNode = this._domTreeOutline.selectedDOMNode();
</span><span class="cx"> if (!selectedDOMNode)
</span><span class="lines">@@ -158,12 +156,12 @@
</span><span class="cx"> event.preventDefault();
</span><span class="cx">
</span><span class="cx"> selectedDOMNode.copyNode();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.canArchiveMainFrame();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="lines">@@ -173,22 +171,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return { customSaveHandler: saveHandler };
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="cx"> return this._numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="cx"> return this._numberOfSearchResults !== null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="lines">@@ -199,9 +197,9 @@
</span><span class="cx"> if (this._currentSearchResultIndex === -1)
</span><span class="cx"> this.revealNextSearchResult();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> if (this._searchQuery === query)
</span><span class="cx"> return;
</span><span class="lines">@@ -238,16 +236,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.getSearchContextNodes(contextNodesReady.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- getSearchContextNodes: function(callback)
</del><ins>+ getSearchContextNodes(callback)
</ins><span class="cx"> {
</span><span class="cx"> // Overwrite this to limit the search to just a subtree.
</span><span class="cx"> // Passing undefined will make DOMAgent.performSearch search through all the documents.
</span><span class="cx"> callback(undefined);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> if (this._searchIdentifier) {
</span><span class="cx"> DOMAgent.discardSearchResults(this._searchIdentifier);
</span><span class="lines">@@ -258,9 +256,9 @@
</span><span class="cx"> this._searchIdentifier = null;
</span><span class="cx"> this._numberOfSearchResults = null;
</span><span class="cx"> this._currentSearchResultIndex = -1;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._numberOfSearchResults)
</span><span class="cx"> return;
</span><span class="lines">@@ -271,9 +269,9 @@
</span><span class="cx"> this._currentSearchResultIndex = this._numberOfSearchResults - 1;
</span><span class="cx">
</span><span class="cx"> this._revealSearchResult(this._currentSearchResultIndex, changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._numberOfSearchResults)
</span><span class="cx"> return;
</span><span class="lines">@@ -284,11 +282,11 @@
</span><span class="cx"> this._currentSearchResultIndex = 0;
</span><span class="cx">
</span><span class="cx"> this._revealSearchResult(this._currentSearchResultIndex, changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _revealSearchResult: function(index, changeFocus)
</del><ins>+ _revealSearchResult(index, changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._searchIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -318,9 +316,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMAgent.getSearchResults(this._searchIdentifier, index, index + 1, revealResult.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _restoreSelectedNodeAfterUpdate: function(documentURL, defaultNode)
</del><ins>+ _restoreSelectedNodeAfterUpdate(documentURL, defaultNode)
</ins><span class="cx"> {
</span><span class="cx"> if (!WebInspector.domTreeManager.restoreSelectedNodeIsAllowed)
</span><span class="cx"> return;
</span><span class="lines">@@ -355,9 +353,9 @@
</span><span class="cx"> WebInspector.domTreeManager.pushNodeByPathToFrontend(this._lastSelectedNodePathSetting.value.path, selectLastSelectedNode.bind(this));
</span><span class="cx"> else
</span><span class="cx"> selectNode.call(this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _selectedNodeDidChange: function(event)
</del><ins>+ _selectedNodeDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var selectedDOMNode = this._domTreeOutline.selectedDOMNode();
</span><span class="cx"> if (selectedDOMNode && !this._dontSetLastSelectedNodePath)
</span><span class="lines">@@ -367,26 +365,26 @@
</span><span class="cx"> ConsoleAgent.addInspectedNode(selectedDOMNode.id);
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _pathComponentSelected: function(event)
</del><ins>+ _pathComponentSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(event.data.pathComponent instanceof WebInspector.DOMTreeElementPathComponent);
</span><span class="cx"> console.assert(event.data.pathComponent.domTreeElement instanceof WebInspector.DOMTreeElement);
</span><span class="cx">
</span><span class="cx"> this._domTreeOutline.selectDOMNode(event.data.pathComponent.domTreeElement.representedObject, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _domNodeChanged: function(event)
</del><ins>+ _domNodeChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> var selectedDOMNode = this._domTreeOutline.selectedDOMNode();
</span><span class="cx"> if (selectedDOMNode !== event.data.node)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseWasClicked: function(event)
</del><ins>+ _mouseWasClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> var anchorElement = event.target.enclosingNodeOrSelfWithNodeName("a");
</span><span class="cx"> if (!anchorElement || !anchorElement.href)
</span><span class="lines">@@ -424,23 +422,23 @@
</span><span class="cx"> // then a double-click happened or another link was clicked.
</span><span class="cx"> // FIXME: The duration might be longer or shorter than the user's configured double click speed.
</span><span class="cx"> this._followLinkTimeoutIdentifier = setTimeout(followLink.bind(this), 333);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleCompositingBorders: function(event)
</del><ins>+ _toggleCompositingBorders(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(PageAgent.setCompositingBordersVisible);
</span><span class="cx">
</span><span class="cx"> var activated = !this._compositingBordersButtonNavigationItem.activated;
</span><span class="cx"> this._compositingBordersButtonNavigationItem.activated = activated;
</span><span class="cx"> PageAgent.setCompositingBordersVisible(activated);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _togglePaintFlashing: function(event)
</del><ins>+ _togglePaintFlashing(event)
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showPaintRectsSetting.value = !WebInspector.showPaintRectsSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateCompositingBordersButtonToMatchPageSettings: function()
</del><ins>+ _updateCompositingBordersButtonToMatchPageSettings()
</ins><span class="cx"> {
</span><span class="cx"> if (!PageAgent.getCompositingBordersVisible)
</span><span class="cx"> return;
</span><span class="lines">@@ -453,28 +451,28 @@
</span><span class="cx"> button.activated = error ? false : compositingBordersVisible;
</span><span class="cx"> button.enabled = error !== "unsupported";
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showPaintRectsSettingChanged: function(event)
</del><ins>+ _showPaintRectsSettingChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(PageAgent.setShowPaintRects);
</span><span class="cx">
</span><span class="cx"> this._paintFlashingButtonNavigationItem.activated = WebInspector.showPaintRectsSetting.value;
</span><span class="cx">
</span><span class="cx"> PageAgent.setShowPaintRects(this._paintFlashingButtonNavigationItem.activated);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showShadowDOMSettingChanged: function(event)
</del><ins>+ _showShadowDOMSettingChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showsShadowDOMButtonNavigationItem.activated = WebInspector.showShadowDOMSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleShowsShadowDOMSetting: function(event)
</del><ins>+ _toggleShowsShadowDOMSetting(event)
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showShadowDOMSetting.value = !WebInspector.showShadowDOMSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showSearchHighlights: function()
</del><ins>+ _showSearchHighlights()
</ins><span class="cx"> {
</span><span class="cx"> console.assert(this._searchIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -505,9 +503,9 @@
</span><span class="cx"> treeElement.highlightSearchResults(this._searchQuery);
</span><span class="cx"> }
</span><span class="cx"> }.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hideSearchHighlights: function()
</del><ins>+ _hideSearchHighlights()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._searchResultNodes)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDatabaseContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,39 +23,34 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DatabaseContentView = function(representedObject)
</del><ins>+WebInspector.DatabaseContentView = class DatabaseContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this.database = representedObject;
</del><ins>+ this.database = representedObject;
</ins><span class="cx">
</span><del>- this.element.classList.add("storage-view", "query", "monospace");
</del><ins>+ this.element.classList.add("storage-view", "query", "monospace");
</ins><span class="cx">
</span><del>- this._promptElement = document.createElement("div");
- this._promptElement.className = "database-query-prompt";
- this.element.appendChild(this._promptElement);
</del><ins>+ this._promptElement = document.createElement("div");
+ this._promptElement.classList.add("database-query-prompt");
+ this.element.appendChild(this._promptElement);
</ins><span class="cx">
</span><del>- this.prompt = new WebInspector.ConsolePrompt(this, "text/x-sql");
- this._promptElement.appendChild(this.prompt.element);
</del><ins>+ this.prompt = new WebInspector.ConsolePrompt(this, "text/x-sql");
+ this._promptElement.appendChild(this.prompt.element);
</ins><span class="cx">
</span><del>- this.element.addEventListener("click", this._messagesClicked.bind(this), true);
-};
</del><ins>+ this.element.addEventListener("click", this._messagesClicked.bind(this), true);
+ }
</ins><span class="cx">
</span><del>-WebInspector.DatabaseContentView.Event = {
- SchemaUpdated: "SchemaUpdated"
-};
-
-WebInspector.DatabaseContentView.prototype = {
- constructor: WebInspector.DatabaseContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this.prompt.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this.prompt.updateLayout();
</span><span class="cx">
</span><span class="lines">@@ -65,16 +60,16 @@
</span><span class="cx"> if (resultElement.dataGrid)
</span><span class="cx"> resultElement.dataGrid.updateLayout();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.Database;
</span><span class="cx"> cookie.host = this.representedObject.host;
</span><span class="cx"> cookie.name = this.representedObject.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- consolePromptCompletionsNeeded: function(prompt, defaultCompletions, base, prefix, suffix)
</del><ins>+ consolePromptCompletionsNeeded(prompt, defaultCompletions, base, prefix, suffix)
</ins><span class="cx"> {
</span><span class="cx"> var results = [];
</span><span class="cx">
</span><span class="lines">@@ -98,21 +93,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.database.getTableNames(tableNamesCallback.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- consolePromptTextCommitted: function(prompt, query)
</del><ins>+ consolePromptTextCommitted(prompt, query)
</ins><span class="cx"> {
</span><span class="cx"> this.database.executeSQL(query, this._queryFinished.bind(this, query), this._queryError.bind(this, query));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _messagesClicked: function()
</del><ins>+ _messagesClicked()
</ins><span class="cx"> {
</span><span class="cx"> this.prompt.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _queryFinished: function(query, columnNames, values)
</del><ins>+ _queryFinished(query, columnNames, values)
</ins><span class="cx"> {
</span><span class="cx"> var dataGrid = WebInspector.DataGrid.createSortableDataGrid(columnNames, values);
</span><span class="cx"> var trimmedQuery = query.trim();
</span><span class="lines">@@ -125,9 +120,9 @@
</span><span class="cx">
</span><span class="cx"> if (trimmedQuery.match(/^create /i) || trimmedQuery.match(/^drop table /i))
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DatabaseContentView.Event.SchemaUpdated, this.database);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _queryError: function(query, error)
</del><ins>+ _queryError(query, error)
</ins><span class="cx"> {
</span><span class="cx"> if (error.message)
</span><span class="cx"> var message = error.message;
</span><span class="lines">@@ -137,9 +132,9 @@
</span><span class="cx"> var message = WebInspector.UIString("An unexpected error %s occurred.").format(error.code);
</span><span class="cx">
</span><span class="cx"> this._appendErrorQueryResult(query, message);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _appendViewQueryResult: function(query, view)
</del><ins>+ _appendViewQueryResult(query, view)
</ins><span class="cx"> {
</span><span class="cx"> var resultElement = this._appendQueryResult(query);
</span><span class="cx">
</span><span class="lines">@@ -148,18 +143,18 @@
</span><span class="cx"> resultElement.appendChild(view.element);
</span><span class="cx">
</span><span class="cx"> this._promptElement.scrollIntoView(false);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _appendErrorQueryResult: function(query, errorText)
</del><ins>+ _appendErrorQueryResult(query, errorText)
</ins><span class="cx"> {
</span><span class="cx"> var resultElement = this._appendQueryResult(query);
</span><span class="cx"> resultElement.classList.add("error");
</span><span class="cx"> resultElement.textContent = errorText;
</span><span class="cx">
</span><span class="cx"> this._promptElement.scrollIntoView(false);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _appendQueryResult: function(query)
</del><ins>+ _appendQueryResult(query)
</ins><span class="cx"> {
</span><span class="cx"> var element = document.createElement("div");
</span><span class="cx"> element.className = "database-user-query";
</span><span class="lines">@@ -177,4 +172,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.DatabaseContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del><ins>+WebInspector.DatabaseContentView.Event = {
+ SchemaUpdated: "SchemaUpdated"
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,63 +23,61 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DatabaseTableContentView = function(representedObject)
</del><ins>+WebInspector.DatabaseTableContentView = class DatabaseTableContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this.element.classList.add("database-table");
</del><ins>+ this.element.classList.add("database-table");
</ins><span class="cx">
</span><del>- this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("database-table-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
- this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
</del><ins>+ this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("database-table-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
+ this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
</ins><span class="cx">
</span><del>- this.update();
-};
</del><ins>+ this.update();
+ }
</ins><span class="cx">
</span><del>-WebInspector.DatabaseTableContentView.prototype = {
- constructor: WebInspector.DatabaseTableContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._refreshButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- update: function()
</del><ins>+ update()
</ins><span class="cx"> {
</span><span class="cx"> this.representedObject.database.executeSQL("SELECT * FROM \"" + this._escapeTableName(this.representedObject.name) + "\"", this._queryFinished.bind(this), this._queryError.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this._dataGrid)
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.DatabaseTable;
</span><span class="cx"> cookie.host = this.representedObject.host;
</span><span class="cx"> cookie.name = this.representedObject.name;
</span><span class="cx"> cookie.database = this.representedObject.database.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> if (!this._dataGrid)
</span><span class="cx"> return [];
</span><span class="cx"> return [this._dataGrid.scrollContainer];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _escapeTableName: function(name)
</del><ins>+ _escapeTableName(name)
</ins><span class="cx"> {
</span><span class="cx"> return name.replace(/\"/g, "\"\"");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _queryFinished: function(columnNames, values)
</del><ins>+ _queryFinished(columnNames, values)
</ins><span class="cx"> {
</span><span class="cx"> // It would be nice to do better than creating a new data grid each time the table is updated, but the table updating
</span><span class="cx"> // doesn't happen very frequently. Additionally, using DataGrid's createSortableDataGrid makes our code much cleaner and it knows
</span><span class="lines">@@ -99,15 +97,15 @@
</span><span class="cx">
</span><span class="cx"> this.element.appendChild(this._dataGrid.element);
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _queryError: function(error)
</del><ins>+ _queryError(error)
</ins><span class="cx"> {
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx"> this.element.appendChild(WebInspector.createMessageTextView(WebInspector.UIString("An error occured trying to\nread the “%s” table.").format(this.representedObject.name), true));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _refreshButtonClicked: function()
</del><ins>+ _refreshButtonClicked()
</ins><span class="cx"> {
</span><span class="cx"> this.update();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,26 +23,24 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.DebuggerTabContentView = function(identifier)
</del><ins>+WebInspector.DebuggerTabContentView = class DebuggerTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Debugger.svg", WebInspector.UIString("Debugger"));
- var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.scopeChainDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Debugger.svg", WebInspector.UIString("Debugger"));
+ var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.scopeChainDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "debugger", "debugger", tabBarItem, WebInspector.DebuggerSidebarPanel, detailsSidebarPanels);
-};
</del><ins>+ super(identifier || "debugger", "debugger", tabBarItem, WebInspector.DebuggerSidebarPanel, detailsSidebarPanels);
+ }
</ins><span class="cx">
</span><del>-WebInspector.DebuggerTabContentView.prototype = {
- constructor: WebInspector.DebuggerTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.DebuggerTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> if (representedObject instanceof WebInspector.Script)
</span><span class="cx"> return true;
</span><span class="lines">@@ -51,9 +49,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return representedObject.type === WebInspector.Resource.Type.Document || representedObject.type === WebInspector.Resource.Type.Script;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showDetailsSidebarPanels: function()
</del><ins>+ showDetailsSidebarPanels()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels.call(this);
</span><span class="cx">
</span><span class="lines">@@ -63,14 +61,14 @@
</span><span class="cx"> WebInspector.scopeChainDetailsSidebarPanel.show();
</span><span class="cx">
</span><span class="cx"> this._showScopeChainDetailsSidebarPanel = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showScopeChainDetailsSidebarPanel: function()
</del><ins>+ showScopeChainDetailsSidebarPanel()
</ins><span class="cx"> {
</span><span class="cx"> this._showScopeChainDetailsSidebarPanel = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealAndSelectBreakpoint: function(breakpoint)
</del><ins>+ revealAndSelectBreakpoint(breakpoint)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(breakpoint instanceof WebInspector.Breakpoint);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsElementsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ElementsTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,39 +23,37 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ElementsTabContentView = function(identifier)
</del><ins>+WebInspector.ElementsTabContentView = class ElementsTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Elements.svg", WebInspector.UIString("Elements"));
- var detailsSidebarPanels = [WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Elements.svg", WebInspector.UIString("Elements"));
+ var detailsSidebarPanels = [WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- if (WebInspector.layerTreeDetailsSidebarPanel)
- detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</del><ins>+ if (WebInspector.layerTreeDetailsSidebarPanel)
+ detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "elements", "elements", tabBarItem, null, detailsSidebarPanels, true);
</del><ins>+ super(identifier || "elements", "elements", tabBarItem, null, detailsSidebarPanels, true);
</ins><span class="cx">
</span><del>- WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</del><ins>+ WebInspector.frameResourceManager.addEventListener(WebInspector.FrameResourceManager.Event.MainFrameDidChange, this._mainFrameDidChange, this);
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</ins><span class="cx">
</span><del>- this._showDOMTreeContentView();
-};
</del><ins>+ this._showDOMTreeContentView();
+ }
</ins><span class="cx">
</span><del>-WebInspector.ElementsTabContentView.prototype = {
- constructor: WebInspector.ElementsTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.ElementsTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.DOMTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showRepresentedObject: function(representedObject, cookie)
</del><ins>+ showRepresentedObject(representedObject, cookie)
</ins><span class="cx"> {
</span><span class="cx"> var domTreeContentView = this.contentBrowser.currentContentView;
</span><span class="cx"> console.assert(!domTreeContentView || domTreeContentView instanceof WebInspector.DOMTreeContentView);
</span><span class="lines">@@ -72,33 +70,33 @@
</span><span class="cx"> // Because nodeToSelect is ephemeral, we don't want to keep
</span><span class="cx"> // it around in the back-forward history entries.
</span><span class="cx"> cookie.nodeToSelect = undefined;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentBrowserTabContentView.prototype.closed.call(this);
</del><ins>+ super.closed();
</ins><span class="cx">
</span><span class="cx"> WebInspector.frameResourceManager.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.Frame.removeEventListener(null, null, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _showDOMTreeContentView: function()
</del><ins>+ _showDOMTreeContentView()
</ins><span class="cx"> {
</span><span class="cx"> this.contentBrowser.contentViewContainer.closeAllContentViews();
</span><span class="cx">
</span><span class="cx"> var mainFrame = WebInspector.frameResourceManager.mainFrame;
</span><span class="cx"> if (mainFrame)
</span><span class="cx"> this.contentBrowser.showContentViewForRepresentedObject(mainFrame.domTree);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mainFrameDidChange: function(event)
</del><ins>+ _mainFrameDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showDOMTreeContentView();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mainResourceDidChange: function(event)
</del><ins>+ _mainResourceDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!event.target.isMainFrame())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFontResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FontResourceContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,32 +23,24 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.FontResourceContentView = function(resource)
</del><ins>+WebInspector.FontResourceContentView = class FontResourceContentView extends WebInspector.ResourceContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.call(this, resource, "font");
</del><ins>+ constructor(resource)
+ {
+ super(resource, "font");
</ins><span class="cx">
</span><del>- this._styleElement = null;
- this._previewElement = null;
-};
</del><ins>+ this._styleElement = null;
+ this._previewElement = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.FontResourceContentView._uniqueFontIdentifier = 0;
-
-WebInspector.FontResourceContentView.PreviewLines = ["ABCDEFGHIJKLM", "NOPQRSTUVWXYZ", "abcdefghijklm", "nopqrstuvwxyz", "1234567890"];
-
-WebInspector.FontResourceContentView.MaximumFontSize = 72;
-WebInspector.FontResourceContentView.MinimumFontSize = 12;
-
-WebInspector.FontResourceContentView.prototype = {
- constructor: WebInspector.FontResourceContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get previewElement()
</span><span class="cx"> {
</span><span class="cx"> return this._previewElement;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- sizeToFit: function()
</del><ins>+ sizeToFit()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._previewElement)
</span><span class="cx"> return;
</span><span class="lines">@@ -59,9 +51,9 @@
</span><span class="cx"> if (this._previewElement.offsetWidth <= this.element.offsetWidth)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- contentAvailable: function(content, base64Encoded)
</del><ins>+ contentAvailable(content, base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx">
</span><span class="lines">@@ -118,28 +110,28 @@
</span><span class="cx"> this.element.appendChild(this._previewElement);
</span><span class="cx">
</span><span class="cx"> this.sizeToFit();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this.sizeToFit();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> // Add the style element since it is removed when hidden.
</span><span class="cx"> if (this._styleElement)
</span><span class="cx"> document.head.appendChild(this._styleElement);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> // Remove the style element so it will not stick around when this content view is destroyed.
</span><span class="cx"> if (this._styleElement && this._styleElement.parentNode)
</span><span class="cx"> this._styleElement.parentNode.removeChild(this._styleElement);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> // This is a workaround for the fact that the browser does not send any events
</span><span class="cx"> // when a @font-face resource is loaded. So, we assume it could be needed until
</span><span class="lines">@@ -148,6 +140,11 @@
</span><span class="cx"> if (this._fontObjectURL)
</span><span class="cx"> URL.revokeObjectURL(this._fontObjectURL);
</span><span class="cx"> }
</span><del>-};
</del><ins>+}
</ins><span class="cx">
</span><del>-WebInspector.FontResourceContentView.prototype.__proto__ = WebInspector.ResourceContentView.prototype;
</del><ins>+WebInspector.FontResourceContentView._uniqueFontIdentifier = 0;
+
+WebInspector.FontResourceContentView.PreviewLines = ["ABCDEFGHIJKLM", "NOPQRSTUVWXYZ", "abcdefghijklm", "nopqrstuvwxyz", "1234567890"];
+
+WebInspector.FontResourceContentView.MaximumFontSize = 72;
+WebInspector.FontResourceContentView.MinimumFontSize = 12;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFrameDOMTreeContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FrameDOMTreeContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FrameDOMTreeContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FrameDOMTreeContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,47 +23,44 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.FrameDOMTreeContentView = function(domTree)
</del><ins>+WebInspector.FrameDOMTreeContentView = class FrameDOMTreeContentView extends WebInspector.DOMTreeContentView
</ins><span class="cx"> {
</span><del>- console.assert(domTree);
</del><ins>+ constructor(domTree)
+ {
+ console.assert(domTree instanceof WebInspector.DOMTree, domTree);
</ins><span class="cx">
</span><del>- WebInspector.DOMTreeContentView.call(this, domTree);
</del><ins>+ super(domTree);
</ins><span class="cx">
</span><del>- this._domTree = domTree;
- this._domTree.addEventListener(WebInspector.DOMTree.Event.RootDOMNodeInvalidated, this._rootDOMNodeInvalidated, this);
</del><ins>+ this._domTree = domTree;
+ this._domTree.addEventListener(WebInspector.DOMTree.Event.RootDOMNodeInvalidated, this._rootDOMNodeInvalidated, this);
</ins><span class="cx">
</span><del>- this._requestRootDOMNode();
-};
</del><ins>+ this._requestRootDOMNode();
+ }
</ins><span class="cx">
</span><del>-
-WebInspector.FrameDOMTreeContentView.prototype = {
- constructor: WebInspector.FrameDOMTreeContentView,
- __proto__: WebInspector.DOMTreeContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get domTree()
</span><span class="cx"> {
</span><span class="cx"> return this._domTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> this._domTree.removeEventListener(null, null, this);
</span><span class="cx">
</span><del>- WebInspector.DOMTreeContentView.prototype.closed.call(this);
- },
</del><ins>+ super.closed();
+ }
</ins><span class="cx">
</span><del>- getSearchContextNodes: function(callback)
</del><ins>+ getSearchContextNodes(callback)
</ins><span class="cx"> {
</span><span class="cx"> this._domTree.requestRootDOMNode(function(rootDOMNode) {
</span><span class="cx"> callback([rootDOMNode.id]);
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _rootDOMNodeAvailable: function(rootDOMNode)
</del><ins>+ _rootDOMNodeAvailable(rootDOMNode)
</ins><span class="cx"> {
</span><span class="cx"> this.domTreeOutline.rootDOMNode = rootDOMNode;
</span><span class="cx">
</span><span class="lines">@@ -73,16 +70,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._restoreSelectedNodeAfterUpdate(this._domTree.frame.url, rootDOMNode.body || rootDOMNode.documentElement || rootDOMNode.firstChild);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rootDOMNodeInvalidated: function(event)
</del><ins>+ _rootDOMNodeInvalidated(event)
</ins><span class="cx"> {
</span><span class="cx"> this._requestRootDOMNode();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _requestRootDOMNode: function()
</del><ins>+ _requestRootDOMNode()
</ins><span class="cx"> {
</span><span class="cx"> this._domTree.requestRootDOMNode(this._rootDOMNodeAvailable.bind(this));
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsGenericResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/GenericResourceContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/GenericResourceContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/GenericResourceContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,15 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.GenericResourceContentView = function(resource)
</del><ins>+WebInspector.GenericResourceContentView = class GenericResourceContentView extends WebInspector.ResourceContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.call(this, resource, WebInspector.GenericResourceContentView.StyleClassName);
</del><ins>+ constructor(resource)
+ {
+ super(resource, "generic");
+ }
</ins><span class="cx"> };
</span><del>-
-WebInspector.GenericResourceContentView.StyleClassName = "generic";
-
-WebInspector.GenericResourceContentView.prototype = {
- constructor: WebInspector.GenericResourceContentView
-};
-
-WebInspector.GenericResourceContentView.prototype.__proto__ = WebInspector.ResourceContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsImageResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,26 +23,23 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ImageResourceContentView = function(resource)
</del><ins>+WebInspector.ImageResourceContentView = class ImageResourceContentView extends WebInspector.ResourceContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.call(this, resource, WebInspector.ImageResourceContentView.StyleClassName);
</del><ins>+ constructor(resource)
+ {
+ super(resource, "image");
</ins><span class="cx">
</span><del>- this._imageElement = null;
-};
</del><ins>+ this._imageElement = null;
+ }
</ins><span class="cx">
</span><del>-WebInspector.ImageResourceContentView.StyleClassName = "image";
-
-WebInspector.ImageResourceContentView.prototype = {
- constructor: WebInspector.ImageResourceContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get imageElement()
</span><span class="cx"> {
</span><span class="cx"> return this._imageElement;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- contentAvailable: function(content, base64Encoded)
</del><ins>+ contentAvailable(content, base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx">
</span><span class="lines">@@ -54,5 +51,3 @@
</span><span class="cx"> this.element.appendChild(this._imageElement);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ImageResourceContentView.prototype.__proto__ = WebInspector.ResourceContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsIndexedDatabaseObjectStoreContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/IndexedDatabaseObjectStoreContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,93 +23,91 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStoreContentView = function(objectStoreOrIndex)
</del><ins>+WebInspector.IndexedDatabaseObjectStoreContentView = class IndexedDatabaseObjectStoreContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, objectStoreOrIndex);
</del><ins>+ constructor(objectStoreOrIndex)
+ {
+ super(objectStoreOrIndex);
</ins><span class="cx">
</span><del>- this.element.classList.add("indexed-database-object-store");
</del><ins>+ this.element.classList.add("indexed-database-object-store");
</ins><span class="cx">
</span><del>- if (objectStoreOrIndex instanceof WebInspector.IndexedDatabaseObjectStore) {
- this._objectStore = objectStoreOrIndex;
- this._objectStoreIndex = null;
- } else if (objectStoreOrIndex instanceof WebInspector.IndexedDatabaseObjectStoreIndex) {
- this._objectStore = objectStoreOrIndex.parentObjectStore;
- this._objectStoreIndex = objectStoreOrIndex;
- }
</del><ins>+ if (objectStoreOrIndex instanceof WebInspector.IndexedDatabaseObjectStore) {
+ this._objectStore = objectStoreOrIndex;
+ this._objectStoreIndex = null;
+ } else if (objectStoreOrIndex instanceof WebInspector.IndexedDatabaseObjectStoreIndex) {
+ this._objectStore = objectStoreOrIndex.parentObjectStore;
+ this._objectStoreIndex = objectStoreOrIndex;
+ }
</ins><span class="cx">
</span><del>- function displayKeyPath(keyPath)
- {
- if (!keyPath)
- return "";
- if (keyPath instanceof Array)
- return keyPath.join(WebInspector.UIString(", "));
- console.assert(keyPath instanceof String || typeof keyPath === "string");
- return keyPath;
- }
</del><ins>+ function displayKeyPath(keyPath)
+ {
+ if (!keyPath)
+ return "";
+ if (keyPath instanceof Array)
+ return keyPath.join(WebInspector.UIString(", "));
+ console.assert(keyPath instanceof String || typeof keyPath === "string");
+ return keyPath;
+ }
</ins><span class="cx">
</span><del>- var displayPrimaryKeyPath = displayKeyPath(this._objectStore.keyPath);
</del><ins>+ var displayPrimaryKeyPath = displayKeyPath(this._objectStore.keyPath);
</ins><span class="cx">
</span><del>- var columnInfo = {
- primaryKey: {title: displayPrimaryKeyPath ? WebInspector.UIString("Primary Key \u2014 %s").format(displayPrimaryKeyPath) : WebInspector.UIString("Primary Key")},
- key: {},
- value: {title: WebInspector.UIString("Value")}
- };
</del><ins>+ var columnInfo = {
+ primaryKey: {title: displayPrimaryKeyPath ? WebInspector.UIString("Primary Key \u2014 %s").format(displayPrimaryKeyPath) : WebInspector.UIString("Primary Key")},
+ key: {},
+ value: {title: WebInspector.UIString("Value")}
+ };
</ins><span class="cx">
</span><del>- if (this._objectStoreIndex) {
- // When there is an index, show the key path in the Key column.
- var displayIndexKeyPath = displayKeyPath(this._objectStoreIndex.keyPath);
- columnInfo.key.title = WebInspector.UIString("Index Key \u2014 %s").format(displayIndexKeyPath);
- } else {
- // Only need to show Key for indexes -- it is the same as Primary Key
- // when there is no index being used.
- delete columnInfo.key;
- }
</del><ins>+ if (this._objectStoreIndex) {
+ // When there is an index, show the key path in the Key column.
+ var displayIndexKeyPath = displayKeyPath(this._objectStoreIndex.keyPath);
+ columnInfo.key.title = WebInspector.UIString("Index Key \u2014 %s").format(displayIndexKeyPath);
+ } else {
+ // Only need to show Key for indexes -- it is the same as Primary Key
+ // when there is no index being used.
+ delete columnInfo.key;
+ }
</ins><span class="cx">
</span><del>- this._dataGrid = new WebInspector.DataGrid(columnInfo);
- this._dataGrid.scrollContainer.addEventListener("scroll", this._dataGridScrolled.bind(this));
- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this._dataGrid = new WebInspector.DataGrid(columnInfo);
+ this._dataGrid.scrollContainer.addEventListener("scroll", this._dataGridScrolled.bind(this));
+ this.element.appendChild(this._dataGrid.element);
</ins><span class="cx">
</span><del>- this._entries = [];
</del><ins>+ this._entries = [];
</ins><span class="cx">
</span><del>- this._fetchMoreData();
</del><ins>+ this._fetchMoreData();
</ins><span class="cx">
</span><del>- this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
- this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
-};
</del><ins>+ this._refreshButtonNavigationItem = new WebInspector.ButtonNavigationItem("indexed-database-object-store-refresh", WebInspector.UIString("Refresh"), "Images/ReloadFull.svg", 13, 13);
+ this._refreshButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._refreshButtonClicked, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.IndexedDatabaseObjectStoreContentView.prototype = {
- constructor: WebInspector.IndexedDatabaseObjectStoreContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._refreshButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> this._reset();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.IndexedDatabaseObjectStore;
</span><span class="cx"> cookie.securityOrigin = this._objectStore.parentDatabase.securityOrigin;
</span><span class="cx"> cookie.databaseName = this._objectStore.parentDatabase.name;
</span><span class="cx"> cookie.objectStoreName = this._objectStore.name;
</span><span class="cx"> cookie.objectStoreIndexName = this._objectStoreIndex && this._objectStoreIndex.name;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._dataGrid.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _reset: function()
</del><ins>+ _reset()
</ins><span class="cx"> {
</span><span class="cx"> for (var entry of this._entries) {
</span><span class="cx"> entry.primaryKey.release();
</span><span class="lines">@@ -119,17 +117,17 @@
</span><span class="cx">
</span><span class="cx"> this._entries = [];
</span><span class="cx"> this._dataGrid.removeChildren();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _dataGridScrolled: function()
</del><ins>+ _dataGridScrolled()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._moreEntriesAvailable || !this._dataGrid.isScrolledToLastRow())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._fetchMoreData();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _fetchMoreData: function()
</del><ins>+ _fetchMoreData()
</ins><span class="cx"> {
</span><span class="cx"> if (this._fetchingMoreData)
</span><span class="cx"> return;
</span><span class="lines">@@ -153,9 +151,9 @@
</span><span class="cx"> this._fetchingMoreData = true;
</span><span class="cx">
</span><span class="cx"> WebInspector.storageManager.requestIndexedDatabaseData(this._objectStore, this._objectStoreIndex, this._entries.length, 25, processEntries.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _refreshButtonClicked: function()
</del><ins>+ _refreshButtonClicked()
</ins><span class="cx"> {
</span><span class="cx"> this._reset();
</span><span class="cx"> this._fetchMoreData();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -25,82 +25,67 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: <https://webkit.org/b/143545> Web Inspector: LogContentView should use higher level objects
</span><span class="cx">
</span><del>-WebInspector.LogContentView = function(representedObject)
</del><ins>+WebInspector.LogContentView = class LogContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ constructor(representedObject)
+ {
+ super(representedObject);
</ins><span class="cx">
</span><del>- this._nestingLevel = 0;
- this._selectedMessages = [];
</del><ins>+ this._nestingLevel = 0;
+ this._selectedMessages = [];
</ins><span class="cx">
</span><del>- // FIXME: Try to use a marker, instead of a list of messages that get re-added.
- this._provisionalMessages = [];
</del><ins>+ // FIXME: Try to use a marker, instead of a list of messages that get re-added.
+ this._provisionalMessages = [];
</ins><span class="cx">
</span><del>- this.element.classList.add("log");
</del><ins>+ this.element.classList.add("log");
</ins><span class="cx">
</span><del>- this.messagesElement = document.createElement("div");
- this.messagesElement.className = "console-messages";
- this.messagesElement.tabIndex = 0;
- this.messagesElement.setAttribute("role", "log");
- this.messagesElement.addEventListener("mousedown", this._mousedown.bind(this));
- this.messagesElement.addEventListener("keydown", this._keyDown.bind(this));
- this.messagesElement.addEventListener("dragstart", this._ondragstart.bind(this), true);
- this.element.appendChild(this.messagesElement);
</del><ins>+ this.messagesElement = document.createElement("div");
+ this.messagesElement.classList.add("console-messages");
+ this.messagesElement.tabIndex = 0;
+ this.messagesElement.setAttribute("role", "log");
+ this.messagesElement.addEventListener("mousedown", this._mousedown.bind(this));
+ this.messagesElement.addEventListener("keydown", this._keyDown.bind(this));
+ this.messagesElement.addEventListener("dragstart", this._ondragstart.bind(this), true);
+ this.element.appendChild(this.messagesElement);
</ins><span class="cx">
</span><del>- this.prompt = WebInspector.quickConsole.prompt;
</del><ins>+ this.prompt = WebInspector.quickConsole.prompt;
</ins><span class="cx">
</span><del>- this._keyboardShortcutCommandA = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "A");
- this._keyboardShortcutEsc = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape);
</del><ins>+ this._keyboardShortcutCommandA = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "A");
+ this._keyboardShortcutEsc = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape);
</ins><span class="cx">
</span><del>- this._logViewController = new WebInspector.JavaScriptLogViewController(this.messagesElement, this.element, this.prompt, this, "console-prompt-history");
- this._lastMessageView = null;
</del><ins>+ this._logViewController = new WebInspector.JavaScriptLogViewController(this.messagesElement, this.element, this.prompt, this, "console-prompt-history");
+ this._lastMessageView = null;
</ins><span class="cx">
</span><del>- this._searchBar = new WebInspector.SearchBar("log-search-bar", WebInspector.UIString("Filter Console Log"), this);
- this._searchBar.addEventListener(WebInspector.SearchBar.Event.TextChanged, this._searchTextDidChange, this);
</del><ins>+ this._searchBar = new WebInspector.SearchBar("log-search-bar", WebInspector.UIString("Filter Console Log"), this);
+ this._searchBar.addEventListener(WebInspector.SearchBar.Event.TextChanged, this._searchTextDidChange, this);
</ins><span class="cx">
</span><del>- var scopeBarItems = [
- new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.All, WebInspector.UIString("All"), true),
- new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Errors, WebInspector.UIString("Errors"), false, "errors"),
- new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Warnings, WebInspector.UIString("Warnings"), false, "warnings"),
- new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Logs, WebInspector.UIString("Logs"), false, "logs")
- ];
</del><ins>+ var scopeBarItems = [
+ new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.All, WebInspector.UIString("All"), true),
+ new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Errors, WebInspector.UIString("Errors"), false, "errors"),
+ new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Warnings, WebInspector.UIString("Warnings"), false, "warnings"),
+ new WebInspector.ScopeBarItem(WebInspector.LogContentView.Scopes.Logs, WebInspector.UIString("Logs"), false, "logs")
+ ];
</ins><span class="cx">
</span><del>- this._scopeBar = new WebInspector.ScopeBar("log-scope-bar", scopeBarItems, scopeBarItems[0]);
- this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
</del><ins>+ this._scopeBar = new WebInspector.ScopeBar("log-scope-bar", scopeBarItems, scopeBarItems[0]);
+ this._scopeBar.addEventListener(WebInspector.ScopeBar.Event.SelectionChanged, this._scopeBarSelectionDidChange, this);
</ins><span class="cx">
</span><del>- this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
- this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
</del><ins>+ this._clearLogNavigationItem = new WebInspector.ButtonNavigationItem("clear-log", WebInspector.UIString("Clear log (%s or %s)").format(this._logViewController.messagesClearKeyboardShortcut.displayName, this._logViewController.messagesAlternateClearKeyboardShortcut.displayName), "Images/NavigationItemTrash.svg", 15, 15);
+ this._clearLogNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._clearLog, this);
</ins><span class="cx">
</span><del>- var toolTip = WebInspector.UIString("Show console tab");
- this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", toolTip, "Images/SplitToggleUp.svg", 16, 16);
- this._showConsoleTabNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._showConsoleTab, this);
</del><ins>+ var toolTip = WebInspector.UIString("Show console tab");
+ this._showConsoleTabNavigationItem = new WebInspector.ButtonNavigationItem("show-tab", toolTip, "Images/SplitToggleUp.svg", 16, 16);
+ this._showConsoleTabNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._showConsoleTab, this);
</ins><span class="cx">
</span><del>- this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
</del><ins>+ this.messagesElement.addEventListener("contextmenu", this._handleContextMenuEvent.bind(this), false);
</ins><span class="cx">
</span><del>- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.SessionStarted, this._sessionStarted, this);
- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, this._messageAdded, this);
- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._previousMessageRepeatCountUpdated, this);
- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._logCleared, this);
</del><ins>+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.SessionStarted, this._sessionStarted, this);
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, this._messageAdded, this);
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.PreviousMessageRepeatCountUpdated, this._previousMessageRepeatCountUpdated, this);
+ WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.Cleared, this._logCleared, this);
</ins><span class="cx">
</span><del>- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ProvisionalLoadStarted, this._provisionalLoadStarted, this);
-};
</del><ins>+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.ProvisionalLoadStarted, this._provisionalLoadStarted, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.LogContentView.Scopes = {
- All: "log-all",
- Errors: "log-errors",
- Warnings: "log-warnings",
- Logs: "log-logs"
-};
-
-WebInspector.LogContentView.ItemWrapperStyleClassName = "console-item";
-WebInspector.LogContentView.FilteredOutStyleClassName = "filtered-out";
-WebInspector.LogContentView.SelectedStyleClassName = "selected";
-WebInspector.LogContentView.SearchInProgressStyleClassName = "search-in-progress";
-WebInspector.LogContentView.FilteredOutBySearchStyleClassName = "filtered-out-by-search";
-WebInspector.LogContentView.HighlightedStyleClassName = "highlighted";
-
-WebInspector.LogContentView.prototype = {
- constructor: WebInspector.LogContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="lines">@@ -109,46 +94,46 @@
</span><span class="cx"> if (WebInspector.isShowingSplitConsole())
</span><span class="cx"> navigationItems.push(this._showConsoleTabNavigationItem);
</span><span class="cx"> return navigationItems;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scopeBar()
</span><span class="cx"> {
</span><span class="cx"> return this._scopeBar;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get logViewController()
</span><span class="cx"> {
</span><span class="cx"> return this._logViewController;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.prototype.updateLayout.call(this);
</del><ins>+ super.updateLayout();
</ins><span class="cx">
</span><span class="cx"> this._scrollElementHeight = this.messagesElement.getBoundingClientRect().height;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this.prompt.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get scrollableElements()
</span><span class="cx"> {
</span><span class="cx"> return [this.element];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get shouldKeepElementsScrolledToBottom()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get searchInProgress()
</span><span class="cx"> {
</span><span class="cx"> return this.messagesElement.classList.contains(WebInspector.LogContentView.SearchInProgressStyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- didAppendConsoleMessageView: function(messageView)
</del><ins>+ didAppendConsoleMessageView(messageView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(messageView instanceof WebInspector.ConsoleMessageView || messageView instanceof WebInspector.ConsoleCommandView);
</span><span class="cx">
</span><span class="lines">@@ -190,24 +175,24 @@
</span><span class="cx"> WebInspector.showSplitConsole();
</span><span class="cx">
</span><span class="cx"> this._logViewController.scrollToBottom();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- promptDidChangeHeight: function()
</del><ins>+ promptDidChangeHeight()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.quickConsole.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="cx"> return {url: "web-inspector:///Console.txt", content: this._formatMessagesAsData(false), forceSaveAs: true};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- handleCopyEvent: function(event)
</del><ins>+ handleCopyEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!this._selectedMessages.length)
</span><span class="cx"> return;
</span><span class="lines">@@ -215,17 +200,17 @@
</span><span class="cx"> event.clipboardData.setData("text/plain", this._formatMessagesAsData(true));
</span><span class="cx"> event.stopPropagation();
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- focusSearchBar: function()
</del><ins>+ focusSearchBar()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._searchBar.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- save: function()
</del><ins>+ save()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -234,9 +219,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebInspector.saveDataToFile(this.saveData);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveAs: function()
</del><ins>+ saveAs()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -245,44 +230,44 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebInspector.saveDataToFile(this.saveData, true);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- highlightPreviousSearchMatch: function()
</del><ins>+ highlightPreviousSearchMatch()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.searchInProgress || isEmptyObject(this._searchMatches))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var index = this._selectedSearchMatch ? this._searchMatches.indexOf(this._selectedSearchMatch) : this._searchMatches.length;
</span><span class="cx"> this._highlightSearchMatchAtIndex(index - 1);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- highlightNextSearchMatch: function()
</del><ins>+ highlightNextSearchMatch()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.searchInProgress || isEmptyObject(this._searchMatches))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var index = this._selectedSearchMatch ? this._searchMatches.indexOf(this._selectedSearchMatch) + 1 : 0;
</span><span class="cx"> this._highlightSearchMatchAtIndex(index);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchBarWantsToLoseFocus: function(searchBar)
</del><ins>+ searchBarWantsToLoseFocus(searchBar)
</ins><span class="cx"> {
</span><span class="cx"> if (this._selectedMessages.length)
</span><span class="cx"> this.messagesElement.focus();
</span><span class="cx"> else
</span><span class="cx"> this.prompt.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchBarDidActivate: function(searchBar)
</del><ins>+ searchBarDidActivate(searchBar)
</ins><span class="cx"> {
</span><span class="cx"> if (!isEmptyObject(this._searchMatches))
</span><span class="cx"> this._highlightSearchMatchAtIndex(0);
</span><span class="cx"> this.prompt.focus();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _formatMessagesAsData: function(onlySelected)
</del><ins>+ _formatMessagesAsData(onlySelected)
</ins><span class="cx"> {
</span><span class="cx"> var messages = this._allMessageElements();
</span><span class="cx">
</span><span class="lines">@@ -306,9 +291,9 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return data;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sessionStarted: function(event)
</del><ins>+ _sessionStarted(event)
</ins><span class="cx"> {
</span><span class="cx"> if (WebInspector.logManager.clearLogOnNavigateSetting.value) {
</span><span class="cx"> this._reappendProvisionalMessages();
</span><span class="lines">@@ -318,9 +303,9 @@
</span><span class="cx"> this._logViewController.startNewSession();
</span><span class="cx">
</span><span class="cx"> this._clearProvisionalState();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _scopeFromMessageLevel: function(level)
</del><ins>+ _scopeFromMessageLevel(level)
</ins><span class="cx"> {
</span><span class="cx"> var messageLevel;
</span><span class="cx">
</span><span class="lines">@@ -339,9 +324,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return messageLevel;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _pulseScopeBarItemBorder: function(level)
</del><ins>+ _pulseScopeBarItemBorder(level)
</ins><span class="cx"> {
</span><span class="cx"> var messageLevel = this._scopeFromMessageLevel(level);
</span><span class="cx">
</span><span class="lines">@@ -352,9 +337,9 @@
</span><span class="cx">
</span><span class="cx"> if (item && !item.selected && !this._scopeBar.item(WebInspector.LogContentView.Scopes.All).selected)
</span><span class="cx"> item.element.classList.add("unread");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _messageAdded: function(event)
</del><ins>+ _messageAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._startedProvisionalLoad)
</span><span class="cx"> this._provisionalMessages.push(event.data.message);
</span><span class="lines">@@ -364,15 +349,15 @@
</span><span class="cx"> this._pulseScopeBarItemBorder(this._lastMessageView.message.level);
</span><span class="cx"> this._filterMessageElements([this._lastMessageView.element]);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _previousMessageRepeatCountUpdated: function(event)
</del><ins>+ _previousMessageRepeatCountUpdated(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._logViewController.updatePreviousMessageRepeatCount(event.data.count) && this._lastMessageView)
</span><span class="cx"> this._pulseScopeBarItemBorder(this._lastMessageView.message.level);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _handleContextMenuEvent: function(event)
</del><ins>+ _handleContextMenuEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> if (!window.getSelection().isCollapsed) {
</span><span class="cx"> // If there is a selection, we want to show our normal context menu
</span><span class="lines">@@ -393,9 +378,9 @@
</span><span class="cx"> contextMenu.appendItem(clearLogOnReloadUIString, this._toggleClearLogOnNavigateSetting.bind(this));
</span><span class="cx">
</span><span class="cx"> contextMenu.show();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mousedown: function(event)
</del><ins>+ _mousedown(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.button !== 0 || event.ctrlKey)
</span><span class="cx"> return;
</span><span class="lines">@@ -414,16 +399,16 @@
</span><span class="cx">
</span><span class="cx"> window.addEventListener("mousemove", this);
</span><span class="cx"> window.addEventListener("mouseup", this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _targetInMessageCanBeSelected: function(target, message)
</del><ins>+ _targetInMessageCanBeSelected(target, message)
</ins><span class="cx"> {
</span><span class="cx"> if (target.enclosingNodeOrSelfWithNodeName("a"))
</span><span class="cx"> return false;
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mousemove: function(event)
</del><ins>+ _mousemove(event)
</ins><span class="cx"> {
</span><span class="cx"> var selection = window.getSelection();
</span><span class="cx"> var wrapper = event.target.enclosingNodeOrSelfWithClass(WebInspector.LogContentView.ItemWrapperStyleClassName);
</span><span class="lines">@@ -456,9 +441,9 @@
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> event.stopPropagation();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseup: function(event)
</del><ins>+ _mouseup(event)
</ins><span class="cx"> {
</span><span class="cx"> window.removeEventListener("mousemove", this);
</span><span class="cx"> window.removeEventListener("mouseup", this);
</span><span class="lines">@@ -488,17 +473,17 @@
</span><span class="cx"> delete this._mouseDownWrapper;
</span><span class="cx"> delete this._mouseDownShiftKey;
</span><span class="cx"> delete this._mouseDownCommandKey;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _ondragstart: function(event)
</del><ins>+ _ondragstart(event)
</ins><span class="cx"> {
</span><span class="cx"> if (event.target.enclosingNodeOrSelfWithClass(WebInspector.DOMTreeOutline.StyleClassName)) {
</span><span class="cx"> event.stopPropagation();
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- handleEvent: function(event)
</del><ins>+ handleEvent(event)
</ins><span class="cx"> {
</span><span class="cx"> switch (event.type) {
</span><span class="cx"> case "mousemove":
</span><span class="lines">@@ -508,9 +493,9 @@
</span><span class="cx"> this._mouseup(event);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _updateMessagesSelection: function(message, multipleSelection, rangeSelection, shouldScrollIntoView)
</del><ins>+ _updateMessagesSelection(message, multipleSelection, rangeSelection, shouldScrollIntoView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(message);
</span><span class="cx"> if (!message)
</span><span class="lines">@@ -562,9 +547,9 @@
</span><span class="cx">
</span><span class="cx"> if (shouldScrollIntoView && !alreadySelectedMessage)
</span><span class="cx"> this._ensureMessageIsVisible(this._selectedMessages.lastValue);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _ensureMessageIsVisible: function(message)
</del><ins>+ _ensureMessageIsVisible(message)
</ins><span class="cx"> {
</span><span class="cx"> if (!message)
</span><span class="cx"> return;
</span><span class="lines">@@ -585,15 +570,15 @@
</span><span class="cx"> if (y > this._scrollElementHeight)
</span><span class="cx"> this.element.scrollTop += y - this._scrollElementHeight;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _positionForMessage: function(message)
</del><ins>+ _positionForMessage(message)
</ins><span class="cx"> {
</span><span class="cx"> var pagePoint = window.webkitConvertPointFromNodeToPage(message, new WebKitPoint(0, 0));
</span><span class="cx"> return window.webkitConvertPointFromPageToNode(this.element, pagePoint);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _isMessageVisible: function(message)
</del><ins>+ _isMessageVisible(message)
</ins><span class="cx"> {
</span><span class="cx"> var node = message;
</span><span class="cx">
</span><span class="lines">@@ -613,23 +598,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _isMessageSelected: function(message)
</del><ins>+ _isMessageSelected(message)
</ins><span class="cx"> {
</span><span class="cx"> return message.classList.contains(WebInspector.LogContentView.SelectedStyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _clearMessagesSelection: function()
</del><ins>+ _clearMessagesSelection()
</ins><span class="cx"> {
</span><span class="cx"> this._selectedMessages.forEach(function(message) {
</span><span class="cx"> message.classList.remove(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx"> });
</span><span class="cx"> this._selectedMessages = [];
</span><span class="cx"> delete this._referenceMessageForRangeSelection;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _selectAllMessages: function()
</del><ins>+ _selectAllMessages()
</ins><span class="cx"> {
</span><span class="cx"> this._clearMessagesSelection();
</span><span class="cx">
</span><span class="lines">@@ -639,21 +624,21 @@
</span><span class="cx"> message.classList.add(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx"> this._selectedMessages.push(message);
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _allMessageElements: function()
</del><ins>+ _allMessageElements()
</ins><span class="cx"> {
</span><span class="cx"> return Array.from(this.messagesElement.querySelectorAll(".console-message, .console-user-command"));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _unfilteredMessageElements: function()
</del><ins>+ _unfilteredMessageElements()
</ins><span class="cx"> {
</span><span class="cx"> return this._allMessageElements().filter(function(message) {
</span><span class="cx"> return !message.classList.contains(WebInspector.LogContentView.FilteredOutStyleClassName);
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _visibleMessageElements: function()
</del><ins>+ _visibleMessageElements()
</ins><span class="cx"> {
</span><span class="cx"> var unfilteredMessages = this._unfilteredMessageElements();
</span><span class="cx">
</span><span class="lines">@@ -663,32 +648,32 @@
</span><span class="cx"> return unfilteredMessages.filter(function(message) {
</span><span class="cx"> return !message.classList.contains(WebInspector.LogContentView.FilteredOutBySearchStyleClassName);
</span><span class="cx"> });
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _logCleared: function(event)
</del><ins>+ _logCleared(event)
</ins><span class="cx"> {
</span><span class="cx"> this._logViewController.clear();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showConsoleTab: function()
</del><ins>+ _showConsoleTab()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showConsoleTab();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleClearLogOnNavigateSetting: function()
</del><ins>+ _toggleClearLogOnNavigateSetting()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.logManager.clearLogOnNavigateSetting.value = !WebInspector.logManager.clearLogOnNavigateSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _clearLog: function()
</del><ins>+ _clearLog()
</ins><span class="cx"> {
</span><span class="cx"> for (var item of this._scopeBar.items)
</span><span class="cx"> item.element.classList.remove("unread");
</span><span class="cx">
</span><span class="cx"> WebInspector.logManager.requestClearMessages();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _scopeBarSelectionDidChange: function(event)
</del><ins>+ _scopeBarSelectionDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> var item = this._scopeBar.selectedItems[0];
</span><span class="cx">
</span><span class="lines">@@ -699,9 +684,9 @@
</span><span class="cx"> item.element.classList.remove("unread");
</span><span class="cx">
</span><span class="cx"> this._filterMessageElements(this._allMessageElements());
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _filterMessageElements: function(messageElements)
</del><ins>+ _filterMessageElements(messageElements)
</ins><span class="cx"> {
</span><span class="cx"> var showsAll = this._scopeBar.item(WebInspector.LogContentView.Scopes.All).selected;
</span><span class="cx">
</span><span class="lines">@@ -725,9 +710,9 @@
</span><span class="cx"> }, this);
</span><span class="cx">
</span><span class="cx"> this._performSearch();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _keyDown: function(event)
</del><ins>+ _keyDown(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._keyboardShortcutCommandA.matchesEvent(event))
</span><span class="cx"> this._commandAWasPressed(event);
</span><span class="lines">@@ -741,15 +726,15 @@
</span><span class="cx"> this._leftArrowWasPressed(event);
</span><span class="cx"> else if (event.keyIdentifier === "Right")
</span><span class="cx"> this._rightArrowWasPressed(event);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _commandAWasPressed: function(event)
</del><ins>+ _commandAWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> this._selectAllMessages();
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _escapeWasPressed: function(event)
</del><ins>+ _escapeWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._selectedMessages.length)
</span><span class="cx"> this._clearMessagesSelection();
</span><span class="lines">@@ -757,9 +742,9 @@
</span><span class="cx"> this.prompt.focus();
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _upArrowWasPressed: function(event)
</del><ins>+ _upArrowWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> var messages = this._visibleMessageElements();
</span><span class="cx">
</span><span class="lines">@@ -779,9 +764,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _downArrowWasPressed: function(event)
</del><ins>+ _downArrowWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> var messages = this._visibleMessageElements();
</span><span class="cx">
</span><span class="lines">@@ -801,9 +786,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _leftArrowWasPressed: function(event)
</del><ins>+ _leftArrowWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._selectedMessages.length !== 1)
</span><span class="cx"> return;
</span><span class="lines">@@ -816,9 +801,9 @@
</span><span class="cx"> currentMessage.__messageView.collapse();
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rightArrowWasPressed: function(event)
</del><ins>+ _rightArrowWasPressed(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._selectedMessages.length !== 1)
</span><span class="cx"> return;
</span><span class="lines">@@ -831,39 +816,39 @@
</span><span class="cx"> currentMessage.__messageView.expand();
</span><span class="cx"> event.preventDefault();
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _previousMessage: function(message)
</del><ins>+ _previousMessage(message)
</ins><span class="cx"> {
</span><span class="cx"> var messages = this._visibleMessageElements();
</span><span class="cx"> for (var i = messages.indexOf(message) - 1; i >= 0; --i) {
</span><span class="cx"> if (this._isMessageVisible(messages[i]))
</span><span class="cx"> return messages[i];
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _nextMessage: function(message)
</del><ins>+ _nextMessage(message)
</ins><span class="cx"> {
</span><span class="cx"> var messages = this._visibleMessageElements();
</span><span class="cx"> for (var i = messages.indexOf(message) + 1; i < messages.length; ++i) {
</span><span class="cx"> if (this._isMessageVisible(messages[i]))
</span><span class="cx"> return messages[i];
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _clearFocusableChildren: function()
</del><ins>+ _clearFocusableChildren()
</ins><span class="cx"> {
</span><span class="cx"> var focusableElements = this.messagesElement.querySelectorAll("[tabindex]");
</span><span class="cx"> for (var i = 0, count = focusableElements.length; i < count; ++i)
</span><span class="cx"> focusableElements[i].removeAttribute("tabindex");
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _searchTextDidChange: function(event)
</del><ins>+ _searchTextDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._performSearch();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _performSearch: function()
</del><ins>+ _performSearch()
</ins><span class="cx"> {
</span><span class="cx"> if (!isEmptyObject(this._searchHighlightDOMChanges))
</span><span class="cx"> WebInspector.revertDomChanges(this._searchHighlightDOMChanges);
</span><span class="lines">@@ -907,9 +892,9 @@
</span><span class="cx"> this._selectedSearchMatch.highlight.classList.remove(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx"> delete this._selectedSearchMatch;
</span><span class="cx"> }
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _highlightRanges: function(message, matchRanges)
</del><ins>+ _highlightRanges(message, matchRanges)
</ins><span class="cx"> {
</span><span class="cx"> var highlightedElements = WebInspector.highlightRangesWithStyleClass(message, matchRanges, WebInspector.LogContentView.HighlightedStyleClassName, this._searchHighlightDOMChanges);
</span><span class="cx">
</span><span class="lines">@@ -926,14 +911,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _rangesOverlap: function(range1, range2)
</del><ins>+ _rangesOverlap(range1, range2)
</ins><span class="cx"> {
</span><span class="cx"> return range1.offset <= range2.offset + range2.length && range2.offset <= range1.offset + range1.length;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _highlightSearchMatchAtIndex: function(index)
</del><ins>+ _highlightSearchMatchAtIndex(index)
</ins><span class="cx"> {
</span><span class="cx"> if (index >= this._searchMatches.length)
</span><span class="cx"> index = 0;
</span><span class="lines">@@ -947,14 +932,14 @@
</span><span class="cx"> this._selectedSearchMatch.highlight.classList.add(WebInspector.LogContentView.SelectedStyleClassName);
</span><span class="cx">
</span><span class="cx"> this._ensureMessageIsVisible(this._selectedSearchMatch.message);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _provisionalLoadStarted: function()
</del><ins>+ _provisionalLoadStarted()
</ins><span class="cx"> {
</span><span class="cx"> this._startedProvisionalLoad = true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _reappendProvisionalMessages: function()
</del><ins>+ _reappendProvisionalMessages()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._startedProvisionalLoad)
</span><span class="cx"> return;
</span><span class="lines">@@ -968,13 +953,25 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._provisionalMessages = [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _clearProvisionalState: function()
</del><ins>+ _clearProvisionalState()
</ins><span class="cx"> {
</span><span class="cx"> this._startedProvisionalLoad = false;
</span><span class="cx"> this._provisionalMessages = [];
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.LogContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del><ins>+WebInspector.LogContentView.Scopes = {
+ All: "log-all",
+ Errors: "log-errors",
+ Warnings: "log-warnings",
+ Logs: "log-logs"
+};
+
+WebInspector.LogContentView.ItemWrapperStyleClassName = "console-item";
+WebInspector.LogContentView.FilteredOutStyleClassName = "filtered-out";
+WebInspector.LogContentView.SelectedStyleClassName = "selected";
+WebInspector.LogContentView.SearchInProgressStyleClassName = "search-in-progress";
+WebInspector.LogContentView.FilteredOutBySearchStyleClassName = "filtered-out-by-search";
+WebInspector.LogContentView.HighlightedStyleClassName = "highlighted";
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,86 +23,84 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NetworkGridContentView = function(representedObject, extraArguments)
</del><ins>+WebInspector.NetworkGridContentView = class NetworkGridContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- console.assert(extraArguments);
- console.assert(extraArguments.networkSidebarPanel instanceof WebInspector.NetworkSidebarPanel);
</del><ins>+ constructor(representedObject, extraArguments)
+ {
+ console.assert(extraArguments);
+ console.assert(extraArguments.networkSidebarPanel instanceof WebInspector.NetworkSidebarPanel);
</ins><span class="cx">
</span><del>- WebInspector.ContentView.call(this, representedObject);
</del><ins>+ super(representedObject);
</ins><span class="cx">
</span><del>- this._networkSidebarPanel = extraArguments.networkSidebarPanel;
</del><ins>+ this._networkSidebarPanel = extraArguments.networkSidebarPanel;
</ins><span class="cx">
</span><del>- this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
- this._contentTreeOutline.onselect = this._treeElementSelected.bind(this);
</del><ins>+ this._contentTreeOutline = this._networkSidebarPanel.contentTreeOutline;
+ this._contentTreeOutline.onselect = this._treeElementSelected.bind(this);
</ins><span class="cx">
</span><del>- var columns = {domain: {}, type: {}, method: {}, scheme: {}, statusCode: {}, cached: {}, size: {}, transferSize: {}, requestSent: {}, latency: {}, duration: {}};
</del><ins>+ var columns = {domain: {}, type: {}, method: {}, scheme: {}, statusCode: {}, cached: {}, size: {}, transferSize: {}, requestSent: {}, latency: {}, duration: {}};
</ins><span class="cx">
</span><del>- columns.domain.title = WebInspector.UIString("Domain");
- columns.domain.width = "10%";
</del><ins>+ columns.domain.title = WebInspector.UIString("Domain");
+ columns.domain.width = "10%";
</ins><span class="cx">
</span><del>- columns.type.title = WebInspector.UIString("Type");
- columns.type.width = "8%";
</del><ins>+ columns.type.title = WebInspector.UIString("Type");
+ columns.type.width = "8%";
</ins><span class="cx">
</span><del>- columns.method.title = WebInspector.UIString("Method");
- columns.method.width = "6%";
</del><ins>+ columns.method.title = WebInspector.UIString("Method");
+ columns.method.width = "6%";
</ins><span class="cx">
</span><del>- columns.scheme.title = WebInspector.UIString("Scheme");
- columns.scheme.width = "6%";
</del><ins>+ columns.scheme.title = WebInspector.UIString("Scheme");
+ columns.scheme.width = "6%";
</ins><span class="cx">
</span><del>- columns.statusCode.title = WebInspector.UIString("Status");
- columns.statusCode.width = "6%";
</del><ins>+ columns.statusCode.title = WebInspector.UIString("Status");
+ columns.statusCode.width = "6%";
</ins><span class="cx">
</span><del>- columns.cached.title = WebInspector.UIString("Cached");
- columns.cached.width = "6%";
</del><ins>+ columns.cached.title = WebInspector.UIString("Cached");
+ columns.cached.width = "6%";
</ins><span class="cx">
</span><del>- columns.size.title = WebInspector.UIString("Size");
- columns.size.width = "8%";
- columns.size.aligned = "right";
</del><ins>+ columns.size.title = WebInspector.UIString("Size");
+ columns.size.width = "8%";
+ columns.size.aligned = "right";
</ins><span class="cx">
</span><del>- columns.transferSize.title = WebInspector.UIString("Transfered");
- columns.transferSize.width = "8%";
- columns.transferSize.aligned = "right";
</del><ins>+ columns.transferSize.title = WebInspector.UIString("Transfered");
+ columns.transferSize.width = "8%";
+ columns.transferSize.aligned = "right";
</ins><span class="cx">
</span><del>- columns.requestSent.title = WebInspector.UIString("Start Time");
- columns.requestSent.width = "9%";
- columns.requestSent.aligned = "right";
</del><ins>+ columns.requestSent.title = WebInspector.UIString("Start Time");
+ columns.requestSent.width = "9%";
+ columns.requestSent.aligned = "right";
</ins><span class="cx">
</span><del>- columns.latency.title = WebInspector.UIString("Latency");
- columns.latency.width = "9%";
- columns.latency.aligned = "right";
</del><ins>+ columns.latency.title = WebInspector.UIString("Latency");
+ columns.latency.width = "9%";
+ columns.latency.aligned = "right";
</ins><span class="cx">
</span><del>- columns.duration.title = WebInspector.UIString("Duration");
- columns.duration.width = "9%";
- columns.duration.aligned = "right";
</del><ins>+ columns.duration.title = WebInspector.UIString("Duration");
+ columns.duration.width = "9%";
+ columns.duration.aligned = "right";
</ins><span class="cx">
</span><del>- for (var column in columns)
- columns[column].sortable = true;
</del><ins>+ for (var column in columns)
+ columns[column].sortable = true;
</ins><span class="cx">
</span><del>- this._dataGrid = new WebInspector.TimelineDataGrid(this._contentTreeOutline, columns);
- this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
- this._dataGrid.sortColumnIdentifier = "requestSent";
- this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</del><ins>+ this._dataGrid = new WebInspector.TimelineDataGrid(this._contentTreeOutline, columns);
+ this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
+ this._dataGrid.sortColumnIdentifier = "requestSent";
+ this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</ins><span class="cx">
</span><del>- this.element.classList.add("network-grid");
- this.element.appendChild(this._dataGrid.element);
</del><ins>+ this.element.classList.add("network-grid");
+ this.element.appendChild(this._dataGrid.element);
</ins><span class="cx">
</span><del>- var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
- networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
- networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
</del><ins>+ var networkTimeline = WebInspector.timelineManager.persistentNetworkTimeline;
+ networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
+ networkTimeline.addEventListener(WebInspector.Timeline.Event.Reset, this._networkTimelineReset, this);
</ins><span class="cx">
</span><del>- this._pendingRecords = [];
-};
</del><ins>+ this._pendingRecords = [];
+ }
</ins><span class="cx">
</span><del>-WebInspector.NetworkGridContentView.prototype = {
- constructor: WebInspector.NetworkGridContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationSidebarTreeOutline()
</span><span class="cx"> {
</span><span class="cx"> return this._contentTreeOutline;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="lines">@@ -112,33 +110,33 @@
</span><span class="cx"> var pathComponent = new WebInspector.GeneralTreeElementPathComponent(this._contentTreeOutline.selectedTreeElement);
</span><span class="cx"> pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._treeElementPathComponentSelected, this);
</span><span class="cx"> return [pathComponent];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get zeroTime()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.timelineManager.persistentNetworkTimeline.startTime;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> this._dataGrid.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> this._dataGrid.hidden();
</span><span class="cx">
</span><del>- WebInspector.ContentView.prototype.hidden.call(this);
- },
</del><ins>+ super.hidden();
+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> this._dataGrid.closed();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (this._scheduledLayoutUpdateIdentifier) {
</span><span class="cx"> cancelAnimationFrame(this._scheduledLayoutUpdateIdentifier);
</span><span class="lines">@@ -148,9 +146,9 @@
</span><span class="cx"> this._dataGrid.updateLayout();
</span><span class="cx">
</span><span class="cx"> this._processPendingRecords();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- needsLayout: function()
</del><ins>+ needsLayout()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._networkSidebarPanel.visible)
</span><span class="cx"> return;
</span><span class="lines">@@ -159,17 +157,17 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._scheduledLayoutUpdateIdentifier = requestAnimationFrame(this.updateLayout.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- reset: function()
</del><ins>+ reset()
</ins><span class="cx"> {
</span><span class="cx"> this._contentTreeOutline.removeChildren();
</span><span class="cx"> this._dataGrid.reset();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _processPendingRecords: function()
</del><ins>+ _processPendingRecords()
</ins><span class="cx"> {
</span><span class="cx"> if (!this._pendingRecords.length)
</span><span class="cx"> return;
</span><span class="lines">@@ -187,14 +185,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._pendingRecords = [];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _networkTimelineReset: function(event)
</del><ins>+ _networkTimelineReset(event)
</ins><span class="cx"> {
</span><span class="cx"> this.reset();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _networkTimelineRecordAdded: function(event)
</del><ins>+ _networkTimelineRecordAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> var resourceTimelineRecord = event.data.record;
</span><span class="cx"> console.assert(resourceTimelineRecord instanceof WebInspector.ResourceTimelineRecord);
</span><span class="lines">@@ -202,17 +200,17 @@
</span><span class="cx"> this._pendingRecords.push(resourceTimelineRecord);
</span><span class="cx">
</span><span class="cx"> this.needsLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _treeElementPathComponentSelected: function(event)
</del><ins>+ _treeElementPathComponentSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> var dataGridNode = this._dataGrid.dataGridNodeForTreeElement(event.data.pathComponent.generalTreeElement);
</span><span class="cx"> if (!dataGridNode)
</span><span class="cx"> return;
</span><span class="cx"> dataGridNode.revealAndSelect();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _treeElementSelected: function(treeElement, selectedByUser)
</del><ins>+ _treeElementSelected(treeElement, selectedByUser)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><span class="cx">
</span><span class="lines">@@ -225,9 +223,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> console.error("Unknown tree element", treeElement);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _dataGridNodeSelected: function(event)
</del><ins>+ _dataGridNodeSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SelectionPathComponentsDidChange);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,29 +23,27 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NetworkTabContentView = function(identifier)
</del><ins>+WebInspector.NetworkTabContentView = class NetworkTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Network.svg", WebInspector.UIString("Network"));
- var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Network.svg", WebInspector.UIString("Network"));
+ var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "network", "network", tabBarItem, WebInspector.NetworkSidebarPanel, detailsSidebarPanels);
-};
</del><ins>+ super(identifier || "network", "network", tabBarItem, WebInspector.NetworkSidebarPanel, detailsSidebarPanels);
+ }
</ins><span class="cx">
</span><del>-WebInspector.NetworkTabContentView.prototype = {
- constructor: WebInspector.NetworkTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.NetworkTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.Resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSplitContentBrowser()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNewTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NewTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,56 +23,54 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.NewTabContentView = function(identifier)
</del><ins>+WebInspector.NewTabContentView = class NewTabContentView extends WebInspector.TabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/NewTab.svg", WebInspector.UIString("New Tab"));
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/NewTab.svg", WebInspector.UIString("New Tab"));
</ins><span class="cx">
</span><del>- WebInspector.TabContentView.call(this, identifier || "new-tab", "new-tab", tabBarItem);
</del><ins>+ super(identifier || "new-tab", "new-tab", tabBarItem);
</ins><span class="cx">
</span><del>- var allowedNewTabs = [
- {image: "Images/Console.svg", title: WebInspector.UIString("Console"), type: WebInspector.ConsoleTabContentView.Type},
- {image: "Images/Debugger.svg", title: WebInspector.UIString("Debugger"), type: WebInspector.DebuggerTabContentView.Type},
- {image: "Images/Elements.svg", title: WebInspector.UIString("Elements"), type: WebInspector.ElementsTabContentView.Type},
- {image: "Images/Network.svg", title: WebInspector.UIString("Network"), type: WebInspector.NetworkTabContentView.Type},
- {image: "Images/Resources.svg", title: WebInspector.UIString("Resources"), type: WebInspector.ResourcesTabContentView.Type},
- {image: "Images/Storage.svg", title: WebInspector.UIString("Storage"), type: WebInspector.StorageTabContentView.Type},
- {image: "Images/Timeline.svg", title: WebInspector.UIString("Timelines"), type: WebInspector.TimelineTabContentView.Type}
- ];
</del><ins>+ var allowedNewTabs = [
+ {image: "Images/Console.svg", title: WebInspector.UIString("Console"), type: WebInspector.ConsoleTabContentView.Type},
+ {image: "Images/Debugger.svg", title: WebInspector.UIString("Debugger"), type: WebInspector.DebuggerTabContentView.Type},
+ {image: "Images/Elements.svg", title: WebInspector.UIString("Elements"), type: WebInspector.ElementsTabContentView.Type},
+ {image: "Images/Network.svg", title: WebInspector.UIString("Network"), type: WebInspector.NetworkTabContentView.Type},
+ {image: "Images/Resources.svg", title: WebInspector.UIString("Resources"), type: WebInspector.ResourcesTabContentView.Type},
+ {image: "Images/Storage.svg", title: WebInspector.UIString("Storage"), type: WebInspector.StorageTabContentView.Type},
+ {image: "Images/Timeline.svg", title: WebInspector.UIString("Timelines"), type: WebInspector.TimelineTabContentView.Type}
+ ];
</ins><span class="cx">
</span><del>- allowedNewTabs.sort(function(a, b) { return a.title.localeCompare(b.title); });
</del><ins>+ allowedNewTabs.sort(function(a, b) { return a.title.localeCompare(b.title); });
</ins><span class="cx">
</span><del>- for (var info of allowedNewTabs) {
- if (!WebInspector.isTabTypeAllowed(info.type))
- continue;
</del><ins>+ for (var info of allowedNewTabs) {
+ if (!WebInspector.isTabTypeAllowed(info.type))
+ continue;
</ins><span class="cx">
</span><del>- var tabItemElement = document.createElement("div");
- tabItemElement.classList.add(WebInspector.NewTabContentView.TabItemStyleClassName);
- tabItemElement.addEventListener("click", this._createNewTab.bind(this, info.type));
- tabItemElement[WebInspector.NewTabContentView.TypeSymbol] = info.type;
</del><ins>+ var tabItemElement = document.createElement("div");
+ tabItemElement.classList.add(WebInspector.NewTabContentView.TabItemStyleClassName);
+ tabItemElement.addEventListener("click", this._createNewTab.bind(this, info.type));
+ tabItemElement[WebInspector.NewTabContentView.TypeSymbol] = info.type;
</ins><span class="cx">
</span><del>- var boxElement = tabItemElement.appendChild(document.createElement("div"));
- boxElement.classList.add("box");
</del><ins>+ var boxElement = tabItemElement.appendChild(document.createElement("div"));
+ boxElement.classList.add("box");
</ins><span class="cx">
</span><del>- var imageElement = boxElement.appendChild(document.createElement("img"));
- imageElement.src = info.image;
</del><ins>+ var imageElement = boxElement.appendChild(document.createElement("img"));
+ imageElement.src = info.image;
</ins><span class="cx">
</span><del>- var labelElement = tabItemElement.appendChild(document.createElement("label"));
- labelElement.textContent = info.title;
</del><ins>+ var labelElement = tabItemElement.appendChild(document.createElement("label"));
+ labelElement.textContent = info.title;
</ins><span class="cx">
</span><del>- this.element.appendChild(tabItemElement);
</del><ins>+ this.element.appendChild(tabItemElement);
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.NewTabContentView.prototype = {
- constructor: WebInspector.NewTabContentView,
- __proto__: WebInspector.TabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.NewTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> shown()
</span><span class="cx"> {
</span><span class="lines">@@ -80,12 +78,12 @@
</span><span class="cx"> WebInspector.tabBrowser.tabBar.addEventListener(WebInspector.TabBar.Event.TabBarItemRemoved, this._updateTabItems, this);
</span><span class="cx">
</span><span class="cx"> this._updateTabItems();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> hidden()
</span><span class="cx"> {
</span><span class="cx"> WebInspector.tabBrowser.tabBar.removeEventListener(null, null, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><span class="lines">@@ -95,7 +93,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebInspector.createNewTab(tabType, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> _updateTabItems()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceClusterContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,46 +23,38 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ResourceClusterContentView = function(resource)
</del><ins>+WebInspector.ResourceClusterContentView = class ResourceClusterContentView extends WebInspector.ClusterContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ClusterContentView.call(this, resource);
-
- this._resource = resource;
- this._resource.addEventListener(WebInspector.Resource.Event.TypeDidChange, this._resourceTypeDidChange, this);
- this._resource.addEventListener(WebInspector.Resource.Event.LoadingDidFinish, this._resourceLoadingDidFinish, this);
-
- function createPathComponent(displayName, className, identifier)
</del><ins>+ constructor(resource)
</ins><span class="cx"> {
</span><del>- var pathComponent = new WebInspector.HierarchicalPathComponent(displayName, className, identifier, false, true);
- pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._pathComponentSelected, this);
- return pathComponent;
- }
</del><ins>+ super(resource);
</ins><span class="cx">
</span><del>- this._requestPathComponent = createPathComponent.call(this, WebInspector.UIString("Request"), WebInspector.ResourceClusterContentView.RequestIconStyleClassName, WebInspector.ResourceClusterContentView.RequestIdentifier);
- this._responsePathComponent = createPathComponent.call(this, WebInspector.UIString("Response"), WebInspector.ResourceClusterContentView.ResponseIconStyleClassName, WebInspector.ResourceClusterContentView.ResponseIdentifier);
</del><ins>+ this._resource = resource;
+ this._resource.addEventListener(WebInspector.Resource.Event.TypeDidChange, this._resourceTypeDidChange, this);
+ this._resource.addEventListener(WebInspector.Resource.Event.LoadingDidFinish, this._resourceLoadingDidFinish, this);
</ins><span class="cx">
</span><del>- this._requestPathComponent.nextSibling = this._responsePathComponent;
- this._responsePathComponent.previousSibling = this._requestPathComponent;
</del><ins>+ function createPathComponent(displayName, className, identifier)
+ {
+ var pathComponent = new WebInspector.HierarchicalPathComponent(displayName, className, identifier, false, true);
+ pathComponent.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this._pathComponentSelected, this);
+ return pathComponent;
+ }
</ins><span class="cx">
</span><del>- this._currentContentViewSetting = new WebInspector.Setting("resource-current-view-" + this._resource.url.hash, WebInspector.ResourceClusterContentView.ResponseIdentifier);
-};
</del><ins>+ this._requestPathComponent = createPathComponent.call(this, WebInspector.UIString("Request"), WebInspector.ResourceClusterContentView.RequestIconStyleClassName, WebInspector.ResourceClusterContentView.RequestIdentifier);
+ this._responsePathComponent = createPathComponent.call(this, WebInspector.UIString("Response"), WebInspector.ResourceClusterContentView.ResponseIconStyleClassName, WebInspector.ResourceClusterContentView.ResponseIdentifier);
</ins><span class="cx">
</span><del>-WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey = "resource-cluster-content-view-identifier";
</del><ins>+ this._requestPathComponent.nextSibling = this._responsePathComponent;
+ this._responsePathComponent.previousSibling = this._requestPathComponent;
</ins><span class="cx">
</span><del>-WebInspector.ResourceClusterContentView.RequestIconStyleClassName = "request-icon";
-WebInspector.ResourceClusterContentView.ResponseIconStyleClassName = "response-icon";
-WebInspector.ResourceClusterContentView.RequestIdentifier = "request";
-WebInspector.ResourceClusterContentView.ResponseIdentifier = "response";
</del><ins>+ this._currentContentViewSetting = new WebInspector.Setting("resource-current-view-" + this._resource.url.hash, WebInspector.ResourceClusterContentView.ResponseIdentifier);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ResourceClusterContentView.prototype = {
- constructor: WebInspector.ResourceClusterContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get responseContentView()
</span><span class="cx"> {
</span><span class="lines">@@ -91,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this._responseContentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get requestContentView()
</span><span class="cx"> {
</span><span class="lines">@@ -104,7 +96,7 @@
</span><span class="cx"> this._requestContentView = new WebInspector.TextContentView(this._resource.requestData || "", this._resource.requestDataContentType);
</span><span class="cx">
</span><span class="cx"> return this._requestContentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get selectionPathComponents()
</span><span class="cx"> {
</span><span class="lines">@@ -118,45 +110,45 @@
</span><span class="cx"> // Append the current view's path components to the path component representing the current view.
</span><span class="cx"> var components = [this._pathComponentForContentView(currentContentView)];
</span><span class="cx"> return components.concat(currentContentView.selectionPathComponents);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ClusterContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> if (this._shownInitialContent)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._showContentViewForIdentifier(this._currentContentViewSetting.value);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><del>- WebInspector.ClusterContentView.prototype.closed.call(this);
</del><ins>+ super.closed();
</ins><span class="cx">
</span><span class="cx"> this._shownInitialContent = false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey] = this._currentContentViewSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- restoreFromCookie: function(cookie)
</del><ins>+ restoreFromCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> var contentView = this._showContentViewForIdentifier(cookie[WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey]);
</span><span class="cx"> if (typeof contentView.revealPosition === "function" && "lineNumber" in cookie && "columnNumber" in cookie)
</span><span class="cx"> contentView.revealPosition(new WebInspector.SourceCodePosition(cookie.lineNumber, cookie.columnNumber));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showRequest: function()
</del><ins>+ showRequest()
</ins><span class="cx"> {
</span><span class="cx"> this._shownInitialContent = true;
</span><span class="cx">
</span><span class="cx"> return this._showContentViewForIdentifier(WebInspector.ResourceClusterContentView.RequestIdentifier);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showResponse: function(positionToReveal, textRangeToSelect, forceUnformatted)
</del><ins>+ showResponse(positionToReveal, textRangeToSelect, forceUnformatted)
</ins><span class="cx"> {
</span><span class="cx"> this._shownInitialContent = true;
</span><span class="cx">
</span><span class="lines">@@ -170,11 +162,11 @@
</span><span class="cx"> if (typeof responseContentView.revealPosition === "function")
</span><span class="cx"> responseContentView.revealPosition(positionToReveal, textRangeToSelect, forceUnformatted);
</span><span class="cx"> return responseContentView;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _canShowRequestContentView: function()
</del><ins>+ _canShowRequestContentView()
</ins><span class="cx"> {
</span><span class="cx"> var requestData = this._resource.requestData;
</span><span class="cx"> if (!requestData)
</span><span class="lines">@@ -185,9 +177,9 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _pathComponentForContentView: function(contentView)
</del><ins>+ _pathComponentForContentView(contentView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(contentView);
</span><span class="cx"> if (!contentView)
</span><span class="lines">@@ -198,9 +190,9 @@
</span><span class="cx"> return this._responsePathComponent;
</span><span class="cx"> console.error("Unknown contentView.");
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _identifierForContentView: function(contentView)
</del><ins>+ _identifierForContentView(contentView)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(contentView);
</span><span class="cx"> if (!contentView)
</span><span class="lines">@@ -211,9 +203,9 @@
</span><span class="cx"> return WebInspector.ResourceClusterContentView.ResponseIdentifier;
</span><span class="cx"> console.error("Unknown contentView.");
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showContentViewForIdentifier: function(identifier)
</del><ins>+ _showContentViewForIdentifier(identifier)
</ins><span class="cx"> {
</span><span class="cx"> var contentViewToShow = null;
</span><span class="cx">
</span><span class="lines">@@ -234,14 +226,14 @@
</span><span class="cx"> this._currentContentViewSetting.value = this._identifierForContentView(contentViewToShow);
</span><span class="cx">
</span><span class="cx"> return this.contentViewContainer.showContentView(contentViewToShow);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _pathComponentSelected: function(event)
</del><ins>+ _pathComponentSelected(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showContentViewForIdentifier(event.data.pathComponent.representedObject);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceTypeDidChange: function(event)
</del><ins>+ _resourceTypeDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> // Since resource views are based on the type, we need to make a new content view and tell the container to replace this
</span><span class="cx"> // content view with the new one. Make a new ResourceContentView which will use the new resource type to make the correct
</span><span class="lines">@@ -254,9 +246,9 @@
</span><span class="cx"> delete this._responseContentView;
</span><span class="cx">
</span><span class="cx"> this.contentViewContainer.replaceContentView(currentResponseContentView, this.responseContentView);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _resourceLoadingDidFinish: function(event)
</del><ins>+ _resourceLoadingDidFinish(event)
</ins><span class="cx"> {
</span><span class="cx"> if ("_positionToReveal" in this) {
</span><span class="cx"> if (this._contentViewContainer.currentContentView === this._responseContentView)
</span><span class="lines">@@ -269,4 +261,9 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.ResourceClusterContentView.prototype.__proto__ = WebInspector.ClusterContentView.prototype;
</del><ins>+WebInspector.ResourceClusterContentView.ContentViewIdentifierCookieKey = "resource-cluster-content-view-identifier";
+
+WebInspector.ResourceClusterContentView.RequestIconStyleClassName = "request-icon";
+WebInspector.ResourceClusterContentView.ResponseIconStyleClassName = "response-icon";
+WebInspector.ResourceClusterContentView.RequestIdentifier = "request";
+WebInspector.ResourceClusterContentView.ResponseIdentifier = "response";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,68 +23,66 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ResourceContentView = function(resource, styleClassName)
</del><ins>+WebInspector.ResourceContentView = class className extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- console.assert(resource);
- console.assert(styleClassName);
</del><ins>+ constructor(resource, styleClassName)
+ {
+ console.assert(resource instanceof WebInspector.Resource, resource);
+ console.assert(typeof styleClassName === "string");
</ins><span class="cx">
</span><del>- WebInspector.ContentView.call(this, resource);
</del><ins>+ super(resource);
</ins><span class="cx">
</span><del>- this._resource = resource;
</del><ins>+ this._resource = resource;
</ins><span class="cx">
</span><del>- this.element.classList.add(styleClassName, "resource");
</del><ins>+ this.element.classList.add(styleClassName, "resource");
</ins><span class="cx">
</span><del>- // Append a spinner while waiting for contentAvailable. The subclasses are responsible for removing
- // the spinner before showing the resource content.
- var spinner = new WebInspector.IndeterminateProgressSpinner;
- this.element.appendChild(spinner.element);
</del><ins>+ // Append a spinner while waiting for contentAvailable. The subclasses are responsible for removing
+ // the spinner before showing the resource content.
+ var spinner = new WebInspector.IndeterminateProgressSpinner;
+ this.element.appendChild(spinner.element);
</ins><span class="cx">
</span><del>- this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
</del><ins>+ this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
</ins><span class="cx">
</span><del>- // Request content last so the spinner will always be removed in case the content is immediately available.
- resource.requestContent().then(this._contentAvailable.bind(this)).catch(this._protocolError.bind(this));
</del><ins>+ // Request content last so the spinner will always be removed in case the content is immediately available.
+ resource.requestContent().then(this._contentAvailable.bind(this)).catch(this._protocolError.bind(this));
</ins><span class="cx">
</span><del>- if (!this.managesOwnIssues) {
- WebInspector.issueManager.addEventListener(WebInspector.IssueManager.Event.IssueWasAdded, this._issueWasAdded, this);
</del><ins>+ if (!this.managesOwnIssues) {
+ WebInspector.issueManager.addEventListener(WebInspector.IssueManager.Event.IssueWasAdded, this._issueWasAdded, this);
</ins><span class="cx">
</span><del>- var issues = WebInspector.issueManager.issuesForSourceCode(resource);
- for (var i = 0; i < issues.length; ++i)
- this.addIssue(issues[i]);
</del><ins>+ var issues = WebInspector.issueManager.issuesForSourceCode(resource);
+ for (var i = 0; i < issues.length; ++i)
+ this.addIssue(issues[i]);
+ }
</ins><span class="cx"> }
</span><del>-};
</del><span class="cx">
</span><del>-WebInspector.ResourceContentView.prototype = {
- constructor: WebInspector.ResourceContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get resource()
</span><span class="cx"> {
</span><span class="cx"> return this._resource;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- contentAvailable: function(content, base64Encoded)
</del><ins>+ contentAvailable(content, base64Encoded)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- addIssue: function(issue)
</del><ins>+ addIssue(issue)
</ins><span class="cx"> {
</span><span class="cx"> // This generically shows only the last issue, subclasses can override for better handling.
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx"> this.element.appendChild(WebInspector.createMessageTextView(issue.text, issue.level === WebInspector.IssueMessage.Level.Error));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.managesOwnIssues)
</span><span class="cx"> WebInspector.issueManager.removeEventListener(null, null, this);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _contentAvailable: function(parameters)
</del><ins>+ _contentAvailable(parameters)
</ins><span class="cx"> {
</span><span class="cx"> if (parameters.error) {
</span><span class="cx"> this._contentError(parameters.error);
</span><span class="lines">@@ -94,28 +92,28 @@
</span><span class="cx"> // Content is ready to show, call the public method now.
</span><span class="cx"> console.assert(!this._hasContent());
</span><span class="cx"> this.contentAvailable(parameters.content, parameters.base64Encoded);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentError: function(error)
</del><ins>+ _contentError(error)
</ins><span class="cx"> {
</span><span class="cx"> if (this._hasContent())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx"> this.element.appendChild(WebInspector.createMessageTextView(error, true));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _protocolError: function(error)
</del><ins>+ _protocolError(error)
</ins><span class="cx"> {
</span><span class="cx"> this._contentError(WebInspector.UIString("An error occurred trying to load the resource."));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _hasContent: function()
</del><ins>+ _hasContent()
</ins><span class="cx"> {
</span><span class="cx"> return !this.element.querySelector("." + WebInspector.IndeterminateProgressSpinner.StyleClassName);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _issueWasAdded: function(event)
</del><ins>+ _issueWasAdded(event)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(!this.managesOwnIssues);
</span><span class="cx">
</span><span class="lines">@@ -126,9 +124,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.addIssue(issue);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _mouseWasClicked: function(event)
</del><ins>+ _mouseWasClicked(event)
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.handlePossibleLinkClick(event, this.resource.parentFrame);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourcesTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,31 +23,29 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ResourcesTabContentView = function(identifier)
</del><ins>+WebInspector.ResourcesTabContentView = class ResourcesTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Resources.svg", WebInspector.UIString("Resources"));
- var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Resources.svg", WebInspector.UIString("Resources"));
+ var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- // FIXME: Until ContentFlows are moved to the Elements tab, these details sidebar panels need to be included.
- detailsSidebarPanels = detailsSidebarPanels.concat([WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel]);
- if (WebInspector.layerTreeDetailsSidebarPanel)
- detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</del><ins>+ // FIXME: Until ContentFlows are moved to the Elements tab, these details sidebar panels need to be included.
+ detailsSidebarPanels = detailsSidebarPanels.concat([WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel]);
+ if (WebInspector.layerTreeDetailsSidebarPanel)
+ detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "resources", "resources", tabBarItem, WebInspector.ResourceSidebarPanel, detailsSidebarPanels);
-};
</del><ins>+ super(identifier || "resources", "resources", tabBarItem, WebInspector.ResourceSidebarPanel, detailsSidebarPanels);
+ }
</ins><span class="cx">
</span><del>-WebInspector.ResourcesTabContentView.prototype = {
- constructor: WebInspector.ResourcesTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.ResourcesTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.Frame
</span><span class="cx"> || representedObject instanceof WebInspector.Resource
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,65 +23,66 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.ScriptContentView = function(script)
</del><ins>+WebInspector.ScriptContentView = class ScriptContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, script);
</del><ins>+ constructor(script)
+ {
+ console.assert(script instanceof WebInspector.Script, script);
</ins><span class="cx">
</span><del>- this.element.classList.add("script");
</del><ins>+ super(script);
</ins><span class="cx">
</span><del>- // Append a spinner while waiting for _contentWillPopulate.
- var spinner = new WebInspector.IndeterminateProgressSpinner;
- this.element.appendChild(spinner.element);
</del><ins>+ this.element.classList.add("script");
</ins><span class="cx">
</span><del>- this._script = script;
</del><ins>+ // Append a spinner while waiting for _contentWillPopulate.
+ var spinner = new WebInspector.IndeterminateProgressSpinner;
+ this.element.appendChild(spinner.element);
</ins><span class="cx">
</span><del>- // This view is only for standalone Scripts with no corresponding Resource. All other Scripts
- // should be handled by TextResourceContentView via the Resource.
- console.assert(!script.resource);
- console.assert(script.range.startLine === 0);
- console.assert(script.range.startColumn === 0);
</del><ins>+ this._script = script;
</ins><span class="cx">
</span><del>- this._textEditor = new WebInspector.SourceCodeTextEditor(script);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.ExecutionLineNumberDidChange, this._executionLineNumberDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
- this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentWillPopulate, this._contentWillPopulate, this);
- this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this);
</del><ins>+ // This view is only for standalone Scripts with no corresponding Resource. All other Scripts
+ // should be handled by TextResourceContentView via the Resource.
+ console.assert(!script.resource);
+ console.assert(script.range.startLine === 0);
+ console.assert(script.range.startColumn === 0);
</ins><span class="cx">
</span><del>- var toolTip = WebInspector.UIString("Pretty print");
- var activatedToolTip = WebInspector.UIString("Original formatting");
- this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
- this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
- this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content.
</del><ins>+ this._textEditor = new WebInspector.SourceCodeTextEditor(script);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.ExecutionLineNumberDidChange, this._executionLineNumberDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
+ this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentWillPopulate, this._contentWillPopulate, this);
+ this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this);
</ins><span class="cx">
</span><del>- var toolTipTypes = WebInspector.UIString("Show type information");
- var activatedToolTipTypes = WebInspector.UIString("Hide type information");
- this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
- this._showTypesButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleTypeAnnotations, this);
- this._showTypesButtonNavigationItem.enabled = false;
</del><ins>+ var toolTip = WebInspector.UIString("Pretty print");
+ var activatedToolTip = WebInspector.UIString("Original formatting");
+ this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
+ this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
+ this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content.
</ins><span class="cx">
</span><del>- WebInspector.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
-};
</del><ins>+ var toolTipTypes = WebInspector.UIString("Show type information");
+ var activatedToolTipTypes = WebInspector.UIString("Hide type information");
+ this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
+ this._showTypesButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleTypeAnnotations, this);
+ this._showTypesButtonNavigationItem.enabled = false;
</ins><span class="cx">
</span><del>-WebInspector.ScriptContentView.prototype = {
- constructor: WebInspector.ScriptContentView,
</del><ins>+ WebInspector.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
+ }
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._prettyPrintButtonNavigationItem, this._showTypesButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get script()
</span><span class="cx"> {
</span><span class="cx"> return this._script;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get textEditor()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supplementalRepresentedObjects()
</span><span class="cx"> {
</span><span class="lines">@@ -91,106 +92,106 @@
</span><span class="cx"> // If the SourceCodeTextEditor has an executionLineNumber, we can assume
</span><span class="cx"> // it is always the active call frame.
</span><span class="cx"> return [WebInspector.debuggerManager.activeCallFrame];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPosition: function(position, textRangeToSelect, forceUnformatted)
</del><ins>+ revealPosition(position, textRangeToSelect, forceUnformatted)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPosition(position, textRangeToSelect, forceUnformatted);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.hidden();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><span class="cx"> WebInspector.showJavaScriptTypeInformationSetting.removeEventListener(null, null, this);
</span><span class="cx">
</span><span class="cx"> this._textEditor.close();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveToCookie: function(cookie)
</del><ins>+ saveToCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> cookie.type = WebInspector.ContentViewCookieType.Resource;
</span><span class="cx"> cookie.url = this.representedObject.url;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- restoreFromCookie: function(cookie)
</del><ins>+ restoreFromCookie(cookie)
</ins><span class="cx"> {
</span><span class="cx"> if ("lineNumber" in cookie && "columnNumber" in cookie)
</span><span class="cx"> this.revealPosition(new WebInspector.SourceCodePosition(cookie.lineNumber, cookie.columnNumber));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="cx"> var url = this._script.url || "web-inspector:///" + encodeURI(this._script.displayName) + ".js";
</span><span class="cx"> return {url, content: this._textEditor.string};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.currentSearchQuery !== null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="cx"> this._textEditor.automaticallyRevealFirstSearchResult = reveal;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.performSearch(query);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.searchCleared();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchQueryWithSelection: function()
</del><ins>+ searchQueryWithSelection()
</ins><span class="cx"> {
</span><span class="cx"> return this._textEditor.searchQueryWithSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPreviousSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _contentWillPopulate: function(event)
</del><ins>+ _contentWillPopulate(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._textEditor.element.parentNode === this.element)
</span><span class="cx"> return;
</span><span class="lines">@@ -201,45 +202,43 @@
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx"> this.element.appendChild(this._textEditor.element);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentDidPopulate: function(event)
</del><ins>+ _contentDidPopulate(event)
</ins><span class="cx"> {
</span><span class="cx"> this._prettyPrintButtonNavigationItem.enabled = this._textEditor.canBeFormatted();
</span><span class="cx"> this._showTypesButtonNavigationItem.enabled = this._textEditor.canShowTypeAnnotations();
</span><span class="cx"> this._showTypesButtonNavigationItem.activated = WebInspector.showJavaScriptTypeInformationSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _togglePrettyPrint: function(event)
</del><ins>+ _togglePrettyPrint(event)
</ins><span class="cx"> {
</span><span class="cx"> var activated = !this._prettyPrintButtonNavigationItem.activated;
</span><span class="cx"> this._textEditor.formatted = activated;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleTypeAnnotations: function(event)
</del><ins>+ _toggleTypeAnnotations(event)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.toggleTypeAnnotations();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showJavaScriptTypeInformationSettingChanged: function(event)
</del><ins>+ _showJavaScriptTypeInformationSettingChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showTypesButtonNavigationItem.activated = WebInspector.showJavaScriptTypeInformationSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _textEditorFormattingDidChange: function(event)
</del><ins>+ _textEditorFormattingDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._prettyPrintButtonNavigationItem.activated = this._textEditor.formatted;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _executionLineNumberDidChange: function(event)
</del><ins>+ _executionLineNumberDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _numberOfSearchResultsDidChange: function(event)
</del><ins>+ _numberOfSearchResultsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.ScriptContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSearchTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,48 +23,46 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SearchTabContentView = function(identifier)
</del><ins>+WebInspector.SearchTabContentView = class SearchTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/SearchResults.svg", WebInspector.UIString("Search"));
- var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel,
- WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/SearchResults.svg", WebInspector.UIString("Search"));
+ var detailsSidebarPanels = [WebInspector.resourceDetailsSidebarPanel, WebInspector.probeDetailsSidebarPanel,
+ WebInspector.domNodeDetailsSidebarPanel, WebInspector.cssStyleDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- if (WebInspector.layerTreeDetailsSidebarPanel)
- detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</del><ins>+ if (WebInspector.layerTreeDetailsSidebarPanel)
+ detailsSidebarPanels.push(WebInspector.layerTreeDetailsSidebarPanel);
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "search", "search", tabBarItem, WebInspector.SearchSidebarPanel, detailsSidebarPanels);
-};
</del><ins>+ super(identifier || "search", "search", tabBarItem, WebInspector.SearchSidebarPanel, detailsSidebarPanels);
+ }
</ins><span class="cx">
</span><del>-WebInspector.SearchTabContentView.prototype = {
- constructor: WebInspector.SearchTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.SearchTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentBrowserTabContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> // Perform on a delay because the field might not be visible yet.
</span><span class="cx"> setTimeout(this.focusSearchField.bind(this));
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.Script || representedObject instanceof WebInspector.DOMTree;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- focusSearchField: function()
</del><ins>+ focusSearchField()
</ins><span class="cx"> {
</span><span class="cx"> this.navigationSidebarPanel.focusSearchField();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(searchQuery)
</del><ins>+ performSearch(searchQuery)
</ins><span class="cx"> {
</span><span class="cx"> this.navigationSidebarPanel.performSearch(searchQuery);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSettingsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SettingsTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,17 +23,15 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.SettingsTabContentView = function(identifier)
</del><ins>+WebInspector.SettingsTabContentView = class SettingsTabContentView extends WebInspector.TabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Gear.svg", WebInspector.UIString("Settings"), true);
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Gear.svg", WebInspector.UIString("Settings"), true);
</ins><span class="cx">
</span><del>- WebInspector.TabContentView.call(this, identifier || "settings", "settings", tabBarItem);
-};
</del><ins>+ super(identifier || "settings", "settings", tabBarItem);
+ }
</ins><span class="cx">
</span><del>-WebInspector.SettingsTabContentView.prototype = {
- constructor: WebInspector.SettingsTabContentView,
- __proto__: WebInspector.TabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsStorageTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/StorageTabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/StorageTabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StorageTabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,26 +23,24 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.StorageTabContentView = function(identifier)
</del><ins>+WebInspector.StorageTabContentView = class StorageTabContentView extends WebInspector.ContentBrowserTabContentView
</ins><span class="cx"> {
</span><del>- var tabBarItem = new WebInspector.TabBarItem("Images/Storage.svg", WebInspector.UIString("Storage"));
- var detailsSidebarPanels = [WebInspector.applicationCacheDetailsSidebarPanel];
</del><ins>+ constructor(identifier)
+ {
+ var tabBarItem = new WebInspector.TabBarItem("Images/Storage.svg", WebInspector.UIString("Storage"));
+ var detailsSidebarPanels = [WebInspector.applicationCacheDetailsSidebarPanel];
</ins><span class="cx">
</span><del>- WebInspector.ContentBrowserTabContentView.call(this, identifier || "storage", "storage", tabBarItem, WebInspector.StorageSidebarPanel, detailsSidebarPanels);
-};
</del><ins>+ super(identifier || "storage", "storage", tabBarItem, WebInspector.StorageSidebarPanel, detailsSidebarPanels);
+ }
</ins><span class="cx">
</span><del>-WebInspector.StorageTabContentView.prototype = {
- constructor: WebInspector.StorageTabContentView,
- __proto__: WebInspector.ContentBrowserTabContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return WebInspector.StorageTabContentView.Type;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.DOMStorageObject || representedObject instanceof WebInspector.CookieStorageObject ||
</span><span class="cx"> representedObject instanceof WebInspector.DatabaseTableObject || representedObject instanceof WebInspector.DatabaseObject ||
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -23,97 +23,95 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TabContentView = function(identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanels)
</del><ins>+WebInspector.TabContentView = class TabContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- console.assert(typeof identifier === "string");
- console.assert(typeof styleClassNames === "string" || styleClassNames.every(function(className) { return typeof className === "string"; }));
- console.assert(tabBarItem instanceof WebInspector.TabBarItem);
- console.assert(!navigationSidebarPanel || navigationSidebarPanel instanceof WebInspector.NavigationSidebarPanel);
- console.assert(!detailsSidebarPanels || detailsSidebarPanels.every(function(detailsSidebarPanel) { return detailsSidebarPanel instanceof WebInspector.DetailsSidebarPanel; }));
</del><ins>+ constructor(identifier, styleClassNames, tabBarItem, navigationSidebarPanel, detailsSidebarPanels)
+ {
+ console.assert(typeof identifier === "string");
+ console.assert(typeof styleClassNames === "string" || styleClassNames.every(function(className) { return typeof className === "string"; }));
+ console.assert(tabBarItem instanceof WebInspector.TabBarItem);
+ console.assert(!navigationSidebarPanel || navigationSidebarPanel instanceof WebInspector.NavigationSidebarPanel);
+ console.assert(!detailsSidebarPanels || detailsSidebarPanels.every(function(detailsSidebarPanel) { return detailsSidebarPanel instanceof WebInspector.DetailsSidebarPanel; }));
</ins><span class="cx">
</span><del>- WebInspector.ContentView.call(this, null);
</del><ins>+ super(null);
</ins><span class="cx">
</span><del>- this.element.classList.add("tab");
</del><ins>+ this.element.classList.add("tab");
</ins><span class="cx">
</span><del>- if (typeof styleClassNames === "string")
- styleClassNames = [styleClassNames];
</del><ins>+ if (typeof styleClassNames === "string")
+ styleClassNames = [styleClassNames];
</ins><span class="cx">
</span><del>- this.element.classList.add(...styleClassNames);
</del><ins>+ this.element.classList.add(...styleClassNames);
</ins><span class="cx">
</span><del>- this._identifier = identifier;
- this._tabBarItem = tabBarItem;
- this._navigationSidebarPanel = navigationSidebarPanel || null;
- this._detailsSidebarPanels = detailsSidebarPanels || [];
</del><ins>+ this._identifier = identifier;
+ this._tabBarItem = tabBarItem;
+ this._navigationSidebarPanel = navigationSidebarPanel || null;
+ this._detailsSidebarPanels = detailsSidebarPanels || [];
</ins><span class="cx">
</span><del>- this._navigationSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-collapsed", false);
</del><ins>+ this._navigationSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-navigation-sidebar-collapsed", false);
</ins><span class="cx">
</span><del>- this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
- this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
</del><ins>+ this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
+ this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
</ins><span class="cx">
</span><del>- this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
-};
</del><ins>+ this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
+ }
</ins><span class="cx">
</span><del>-WebInspector.TabContentView.prototype = {
- constructor: WebInspector.TabContentView,
- __proto__: WebInspector.ContentView.prototype,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get parentTabBrowser()
</span><span class="cx"> {
</span><span class="cx"> return this._parentTabBrowser;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set parentTabBrowser(tabBrowser)
</span><span class="cx"> {
</span><span class="cx"> this._parentTabBrowser = tabBrowser || null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get identifier()
</span><span class="cx"> {
</span><span class="cx"> return this._identifier;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get tabBarItem()
</span><span class="cx"> {
</span><span class="cx"> return this._tabBarItem;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get managesDetailsSidebarPanels()
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showDetailsSidebarPanels: function()
</del><ins>+ showDetailsSidebarPanels()
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- showRepresentedObject: function(representedObject, cookie)
</del><ins>+ showRepresentedObject(representedObject, cookie)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- canShowRepresentedObject: function(representedObject)
</del><ins>+ canShowRepresentedObject(representedObject)
</ins><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> return false;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><span class="cx"> if (this._shouldRestoreStateWhenShown)
</span><span class="cx"> this.restoreStateFromCookie(WebInspector.StateRestorationType.Delayed);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- restoreStateFromCookie: function(restorationType)
</del><ins>+ restoreStateFromCookie(restorationType)
</ins><span class="cx"> {
</span><span class="cx"> if (!this.navigationSidebarPanel)
</span><span class="cx"> return;
</span><span class="lines">@@ -132,9 +130,9 @@
</span><span class="cx"> relaxMatchDelay = 2000;
</span><span class="cx">
</span><span class="cx"> this.navigationSidebarPanel.restoreStateFromCookie(this._cookieSetting.value || {}, relaxMatchDelay);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- saveStateToCookie: function()
</del><ins>+ saveStateToCookie()
</ins><span class="cx"> {
</span><span class="cx"> if (!this.navigationSidebarPanel)
</span><span class="cx"> return;
</span><span class="lines">@@ -145,27 +143,27 @@
</span><span class="cx"> var cookie = {};
</span><span class="cx"> this.navigationSidebarPanel.saveStateToCookie(cookie);
</span><span class="cx"> this._cookieSetting.value = cookie;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationSidebarPanel()
</span><span class="cx"> {
</span><span class="cx"> return this._navigationSidebarPanel;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationSidebarCollapsedSetting()
</span><span class="cx"> {
</span><span class="cx"> return this._navigationSidebarCollapsedSetting;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get detailsSidebarPanels()
</span><span class="cx"> {
</span><span class="cx"> return this._detailsSidebarPanels;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get detailsSidebarCollapsedSetting()
</span><span class="cx"> {
</span><span class="cx"> return this._detailsSidebarCollapsedSetting;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get detailsSidebarSelectedPanelSetting()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,153 +23,150 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TextContentView = function(string, mimeType)
</del><ins>+WebInspector.TextContentView = class TextContentView extends WebInspector.ContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.call(this, string);
</del><ins>+ constructor(string, mimeType)
+ {
+ super(string);
</ins><span class="cx">
</span><del>- this.element.classList.add("text");
</del><ins>+ this.element.classList.add("text");
</ins><span class="cx">
</span><del>- this._textEditor = new WebInspector.TextEditor;
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
</del><ins>+ this._textEditor = new WebInspector.TextEditor;
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
</ins><span class="cx">
</span><del>- this.element.appendChild(this._textEditor.element);
</del><ins>+ this.element.appendChild(this._textEditor.element);
</ins><span class="cx">
</span><del>- this._textEditor.readOnly = true;
- this._textEditor.mimeType = mimeType;
- this._textEditor.string = string;
</del><ins>+ this._textEditor.readOnly = true;
+ this._textEditor.mimeType = mimeType;
+ this._textEditor.string = string;
</ins><span class="cx">
</span><del>- var toolTip = WebInspector.UIString("Pretty print");
- var activatedToolTip = WebInspector.UIString("Original formatting");
- this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
- this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
- this._prettyPrintButtonNavigationItem.enabled = this._textEditor.canBeFormatted();
</del><ins>+ var toolTip = WebInspector.UIString("Pretty print");
+ var activatedToolTip = WebInspector.UIString("Original formatting");
+ this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
+ this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
+ this._prettyPrintButtonNavigationItem.enabled = this._textEditor.canBeFormatted();
</ins><span class="cx">
</span><del>- var toolTipTypes = WebInspector.UIString("Show type information");
- var activatedToolTipTypes = WebInspector.UIString("Hide type information");
- this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
- this._showTypesButtonNavigationItem.enabled = false;
-};
</del><ins>+ var toolTipTypes = WebInspector.UIString("Show type information");
+ var activatedToolTipTypes = WebInspector.UIString("Hide type information");
+ this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
+ this._showTypesButtonNavigationItem.enabled = false;
+ }
</ins><span class="cx">
</span><del>-WebInspector.TextContentView.prototype = {
- constructor: WebInspector.TextContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get textEditor()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._prettyPrintButtonNavigationItem, this._showTypesButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPosition: function(position, textRangeToSelect, forceUnformatted)
</del><ins>+ revealPosition(position, textRangeToSelect, forceUnformatted)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPosition(position, textRangeToSelect, forceUnformatted);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> this._textEditor.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.prototype.hidden.call(this);
</del><ins>+ super.hidden();
</ins><span class="cx">
</span><span class="cx"> this._textEditor.hidden();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><del>- WebInspector.ContentView.prototype.closed.call(this);
</del><ins>+ super.closed();
</ins><span class="cx">
</span><span class="cx"> this._textEditor.close();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="cx"> var url = "web-inspector:///" + encodeURI(WebInspector.UIString("Untitled")) + ".txt";
</span><span class="cx"> return {url, content: this._textEditor.string, forceSaveAs: true};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.currentSearchQuery !== null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="cx"> this._textEditor.automaticallyRevealFirstSearchResult = reveal;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.performSearch(query);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.searchCleared();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchQueryWithSelection: function()
</del><ins>+ searchQueryWithSelection()
</ins><span class="cx"> {
</span><span class="cx"> return this._textEditor.searchQueryWithSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPreviousSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _togglePrettyPrint: function(event)
</del><ins>+ _togglePrettyPrint(event)
</ins><span class="cx"> {
</span><span class="cx"> var activated = !this._prettyPrintButtonNavigationItem.activated;
</span><span class="cx"> this._textEditor.formatted = activated;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _textEditorFormattingDidChange: function(event)
</del><ins>+ _textEditorFormattingDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._prettyPrintButtonNavigationItem.activated = this._textEditor.formatted;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _numberOfSearchResultsDidChange: function(event)
</del><ins>+ _numberOfSearchResultsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.TextContentView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextResourceContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextResourceContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,60 +23,57 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.TextResourceContentView = function(resource)
</del><ins>+WebInspector.TextResourceContentView = class TextResourceContentView extends WebInspector.ResourceContentView
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.call(this, resource, WebInspector.TextResourceContentView.StyleClassName);
</del><ins>+ constructor(resource)
+ {
+ super(resource, "text");
</ins><span class="cx">
</span><del>- resource.addEventListener(WebInspector.SourceCode.Event.ContentDidChange, this._sourceCodeContentDidChange, this);
</del><ins>+ resource.addEventListener(WebInspector.SourceCode.Event.ContentDidChange, this._sourceCodeContentDidChange, this);
</ins><span class="cx">
</span><del>- this._textEditor = new WebInspector.SourceCodeTextEditor(resource);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.ExecutionLineNumberDidChange, this._executionLineNumberDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.ContentDidChange, this._textEditorContentDidChange, this);
- this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
- this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentWillPopulate, this._contentWillPopulate, this);
- this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this);
</del><ins>+ this._textEditor = new WebInspector.SourceCodeTextEditor(resource);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.ExecutionLineNumberDidChange, this._executionLineNumberDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.NumberOfSearchResultsDidChange, this._numberOfSearchResultsDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.ContentDidChange, this._textEditorContentDidChange, this);
+ this._textEditor.addEventListener(WebInspector.TextEditor.Event.FormattingDidChange, this._textEditorFormattingDidChange, this);
+ this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentWillPopulate, this._contentWillPopulate, this);
+ this._textEditor.addEventListener(WebInspector.SourceCodeTextEditor.Event.ContentDidPopulate, this._contentDidPopulate, this);
</ins><span class="cx">
</span><del>- WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetsChanged, this);
- WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetsChanged, this);
</del><ins>+ WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetsChanged, this);
+ WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetsChanged, this);
</ins><span class="cx">
</span><del>- var toolTip = WebInspector.UIString("Pretty print");
- var activatedToolTip = WebInspector.UIString("Original formatting");
- this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
- this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
- this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content.
</del><ins>+ var toolTip = WebInspector.UIString("Pretty print");
+ var activatedToolTip = WebInspector.UIString("Original formatting");
+ this._prettyPrintButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("pretty-print", toolTip, activatedToolTip, "Images/NavigationItemCurleyBraces.svg", 13, 13);
+ this._prettyPrintButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._togglePrettyPrint, this);
+ this._prettyPrintButtonNavigationItem.enabled = false; // Enabled when the text editor is populated with content.
</ins><span class="cx">
</span><del>- var toolTipTypes = WebInspector.UIString("Show type information");
- var activatedToolTipTypes = WebInspector.UIString("Hide type information");
- this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
- this._showTypesButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleTypeAnnotations, this);
- this._showTypesButtonNavigationItem.enabled = false;
</del><ins>+ var toolTipTypes = WebInspector.UIString("Show type information");
+ var activatedToolTipTypes = WebInspector.UIString("Hide type information");
+ this._showTypesButtonNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-types", toolTipTypes, activatedToolTipTypes, "Images/NavigationItemTypes.svg", 13, 14);
+ this._showTypesButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleTypeAnnotations, this);
+ this._showTypesButtonNavigationItem.enabled = false;
</ins><span class="cx">
</span><del>- WebInspector.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
-};
</del><ins>+ WebInspector.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
+ }
</ins><span class="cx">
</span><del>-WebInspector.TextResourceContentView.StyleClassName = "text";
-
-WebInspector.TextResourceContentView.prototype = {
- constructor: WebInspector.TextResourceContentView,
-
</del><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> get navigationItems()
</span><span class="cx"> {
</span><span class="cx"> return [this._prettyPrintButtonNavigationItem, this._showTypesButtonNavigationItem];
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get managesOwnIssues()
</span><span class="cx"> {
</span><span class="cx"> // SourceCodeTextEditor manages the issues, we don't need ResourceContentView doing it.
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get textEditor()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supplementalRepresentedObjects()
</span><span class="cx"> {
</span><span class="lines">@@ -90,101 +87,101 @@
</span><span class="cx"> objects.push(WebInspector.debuggerManager.activeCallFrame);
</span><span class="cx">
</span><span class="cx"> return objects;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPosition: function(position, textRangeToSelect, forceUnformatted)
</del><ins>+ revealPosition(position, textRangeToSelect, forceUnformatted)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPosition(position, textRangeToSelect, forceUnformatted);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- shown: function()
</del><ins>+ shown()
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.prototype.shown.call(this);
</del><ins>+ super.shown();
</ins><span class="cx">
</span><span class="cx"> this._textEditor.shown();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- hidden: function()
</del><ins>+ hidden()
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.prototype.hidden.call(this);
</del><ins>+ super.hidden();
</ins><span class="cx">
</span><span class="cx"> this._textEditor.hidden();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- closed: function()
</del><ins>+ closed()
</ins><span class="cx"> {
</span><del>- WebInspector.ResourceContentView.prototype.closed.call(this);
</del><ins>+ super.closed();
</ins><span class="cx">
</span><span class="cx"> this.resource.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.probeManager.removeEventListener(null, null, this);
</span><span class="cx"> WebInspector.showJavaScriptTypeInformationSetting.removeEventListener(null, null, this);
</span><span class="cx">
</span><span class="cx"> this._textEditor.close();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSave()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get saveData()
</span><span class="cx"> {
</span><span class="cx"> return {url: this.resource.url, content: this._textEditor.string};
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get supportsSearch()
</span><span class="cx"> {
</span><span class="cx"> return true;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get numberOfSearchResults()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.numberOfSearchResults;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> get hasPerformedSearch()
</span><span class="cx"> {
</span><span class="cx"> return this._textEditor.currentSearchQuery !== null;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> set automaticallyRevealFirstSearchResult(reveal)
</span><span class="cx"> {
</span><span class="cx"> this._textEditor.automaticallyRevealFirstSearchResult = reveal;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- performSearch: function(query)
</del><ins>+ performSearch(query)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.performSearch(query);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchCleared: function()
</del><ins>+ searchCleared()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.searchCleared();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- searchQueryWithSelection: function()
</del><ins>+ searchQueryWithSelection()
</ins><span class="cx"> {
</span><span class="cx"> return this._textEditor.searchQueryWithSelection();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealPreviousSearchResult: function(changeFocus)
</del><ins>+ revealPreviousSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealPreviousSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- revealNextSearchResult: function(changeFocus)
</del><ins>+ revealNextSearchResult(changeFocus)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.revealNextSearchResult(changeFocus);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- updateLayout: function()
</del><ins>+ updateLayout()
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.updateLayout();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Private
</span><span class="cx">
</span><del>- _contentWillPopulate: function(event)
</del><ins>+ _contentWillPopulate(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._textEditor.element.parentNode === this.element)
</span><span class="cx"> return;
</span><span class="lines">@@ -199,67 +196,65 @@
</span><span class="cx">
</span><span class="cx"> this.element.removeChildren();
</span><span class="cx"> this.element.appendChild(this._textEditor.element);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _contentDidPopulate: function(event)
</del><ins>+ _contentDidPopulate(event)
</ins><span class="cx"> {
</span><span class="cx"> this._prettyPrintButtonNavigationItem.enabled = this._textEditor.canBeFormatted();
</span><span class="cx"> this._showTypesButtonNavigationItem.enabled = this._textEditor.canShowTypeAnnotations();
</span><span class="cx"> this._showTypesButtonNavigationItem.activated = WebInspector.showJavaScriptTypeInformationSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _togglePrettyPrint: function(event)
</del><ins>+ _togglePrettyPrint(event)
</ins><span class="cx"> {
</span><span class="cx"> var activated = !this._prettyPrintButtonNavigationItem.activated;
</span><span class="cx"> this._textEditor.formatted = activated;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _toggleTypeAnnotations: function(event)
</del><ins>+ _toggleTypeAnnotations(event)
</ins><span class="cx"> {
</span><span class="cx"> this._textEditor.toggleTypeAnnotations();
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _showJavaScriptTypeInformationSettingChanged: function(event)
</del><ins>+ _showJavaScriptTypeInformationSettingChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> this._showTypesButtonNavigationItem.activated = WebInspector.showJavaScriptTypeInformationSetting.value;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _textEditorFormattingDidChange: function(event)
</del><ins>+ _textEditorFormattingDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._prettyPrintButtonNavigationItem.activated = this._textEditor.formatted;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _sourceCodeContentDidChange: function(event)
</del><ins>+ _sourceCodeContentDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> if (this._ignoreSourceCodeContentDidChangeEvent)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._textEditor.string = this.resource.currentRevision.content;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _textEditorContentDidChange: function(event)
</del><ins>+ _textEditorContentDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this._ignoreSourceCodeContentDidChangeEvent = true;
</span><span class="cx"> WebInspector.branchManager.currentBranch.revisionForRepresentedObject(this.resource).content = this._textEditor.string;
</span><span class="cx"> delete this._ignoreSourceCodeContentDidChangeEvent;
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _executionLineNumberDidChange: function(event)
</del><ins>+ _executionLineNumberDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _numberOfSearchResultsDidChange: function(event)
</del><ins>+ _numberOfSearchResultsDidChange(event)
</ins><span class="cx"> {
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.NumberOfSearchResultsDidChange);
</span><del>- },
</del><ins>+ }
</ins><span class="cx">
</span><del>- _probeSetsChanged: function(event)
</del><ins>+ _probeSetsChanged(event)
</ins><span class="cx"> {
</span><span class="cx"> var breakpoint = event.data.probeSet.breakpoint;
</span><span class="cx"> if (breakpoint.sourceCodeLocation.sourceCode === this.resource)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.ContentView.Event.SupplementalRepresentedObjectsDidChange);
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.TextResourceContentView.prototype.__proto__ = WebInspector.ResourceContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (187966 => 187967)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-08-05 18:09:00 UTC (rev 187966)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2015-08-05 18:12:35 UTC (rev 187967)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> console.assert(timeline instanceof WebInspector.Timeline, timeline);
</span><span class="cx"> console.assert(!this._timelineViewMap.has(timeline), timeline);
</span><span class="cx">
</span><del>- this._timelineViewMap.set(timeline, new WebInspector.ContentView(timeline, {timelineSidebarPanel: this._timelineSidebarPanel}));
</del><ins>+ this._timelineViewMap.set(timeline, WebInspector.ContentView.createFromRepresentedObject(timeline, {timelineSidebarPanel: this._timelineSidebarPanel}));
</ins><span class="cx"> if (timeline.type === WebInspector.TimelineRecord.Type.RenderingFrame)
</span><span class="cx"> this._renderingFrameTimeline = timeline;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>