Modified: trunk/Source/WebCore/ChangeLog (92854 => 92855)
--- trunk/Source/WebCore/ChangeLog 2011-08-11 15:57:00 UTC (rev 92854)
+++ trunk/Source/WebCore/ChangeLog 2011-08-11 16:36:00 UTC (rev 92855)
@@ -1,5 +1,21 @@
2011-08-11 Andrey Kosyakov <[email protected]>
+ Web Inspector: [refactoring] make tabbed pane a view
+ https://bugs.webkit.org/show_bug.cgi?id=66060
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/NetworkItemView.js:
+ (WebInspector.NetworkItemView):
+ (WebInspector.NetworkItemView.prototype.show):
+ (WebInspector.NetworkItemView.prototype._selectTab.get if):
+ (WebInspector.NetworkItemView.prototype._selectTab):
+ * inspector/front-end/TabbedPane.js:
+ (WebInspector.TabbedPane):
+ * inspector/front-end/inspector.html:
+
+2011-08-11 Andrey Kosyakov <[email protected]>
+
Web Inspector: source frame popover simetimes pops up after user switches from Scripts panel
https://bugs.webkit.org/show_bug.cgi?id=66057
Modified: trunk/Source/WebCore/inspector/front-end/NetworkItemView.js (92854 => 92855)
--- trunk/Source/WebCore/inspector/front-end/NetworkItemView.js 2011-08-11 15:57:00 UTC (rev 92854)
+++ trunk/Source/WebCore/inspector/front-end/NetworkItemView.js 2011-08-11 16:36:00 UTC (rev 92855)
@@ -30,37 +30,36 @@
WebInspector.NetworkItemView = function(resource)
{
- WebInspector.View.call(this);
+ WebInspector.TabbedPane.call(this);
this.element.addStyleClass("network-item-view");
- this._tabbedPane = new WebInspector.TabbedPane(this.element);
var headersView = new WebInspector.ResourceHeadersView(resource);
- this._tabbedPane.appendTab("headers", WebInspector.UIString("Headers"), headersView);
+ this.appendTab("headers", WebInspector.UIString("Headers"), headersView);
var responseView = new WebInspector.ResourceResponseView(resource);
var previewView = new WebInspector.ResourcePreviewView(resource, responseView);
- this._tabbedPane.appendTab("preview", WebInspector.UIString("Preview"), previewView);
- this._tabbedPane.appendTab("response", WebInspector.UIString("Response"), responseView);
+ this.appendTab("preview", WebInspector.UIString("Preview"), previewView);
+ this.appendTab("response", WebInspector.UIString("Response"), responseView);
if (Preferences.showCookiesTab) {
this._cookiesView = new WebInspector.ResourceCookiesView(resource);
- this._tabbedPane.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
+ this.appendTab("cookies", WebInspector.UIString("Cookies"), this._cookiesView);
}
if (Preferences.showTimingTab) {
var timingView = new WebInspector.ResourceTimingView(resource);
- this._tabbedPane.appendTab("timing", WebInspector.UIString("Timing"), timingView);
+ this.appendTab("timing", WebInspector.UIString("Timing"), timingView);
}
- this._tabbedPane.addEventListener("tab-selected", this._tabSelected, this);
+ this.addEventListener("tab-selected", this._tabSelected, this);
}
WebInspector.NetworkItemView.prototype = {
show: function(parentElement)
{
- WebInspector.View.prototype.show.call(this, parentElement);
+ WebInspector.TabbedPane.prototype.show.call(this, parentElement);
this._selectTab();
},
@@ -69,9 +68,9 @@
if (!tabId)
tabId = WebInspector.settings.resourceViewTab.get();
- if (!this._tabbedPane.selectTab(tabId)) {
+ if (!this.selectTab(tabId)) {
this._isInFallbackSelection = true;
- this._tabbedPane.selectTab("headers");
+ this.selectTab("headers");
delete this._isInFallbackSelection;
}
},
@@ -98,7 +97,7 @@
}
}
-WebInspector.NetworkItemView.prototype.__proto__ = WebInspector.View.prototype;
+WebInspector.NetworkItemView.prototype.__proto__ = WebInspector.TabbedPane.prototype;
WebInspector.ResourceContentView = function(resource)
{
Modified: trunk/Source/WebCore/inspector/front-end/TabbedPane.js (92854 => 92855)
--- trunk/Source/WebCore/inspector/front-end/TabbedPane.js 2011-08-11 15:57:00 UTC (rev 92854)
+++ trunk/Source/WebCore/inspector/front-end/TabbedPane.js 2011-08-11 16:36:00 UTC (rev 92855)
@@ -30,7 +30,7 @@
WebInspector.TabbedPane = function(element)
{
- this.element = element || document.createElement("div");
+ WebInspector.View.call(this, element);
this.element.addStyleClass("tabbed-pane");
this._tabsElement = this.element.createChild("div", "tabbed-pane-header");
this._contentElement = this.element.createChild("div", "tabbed-pane-content");
@@ -81,4 +81,4 @@
}
}
-WebInspector.TabbedPane.prototype.__proto__ = WebInspector.Object.prototype;
+WebInspector.TabbedPane.prototype.__proto__ = WebInspector.View.prototype;
Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (92854 => 92855)
--- trunk/Source/WebCore/inspector/front-end/inspector.html 2011-08-11 15:57:00 UTC (rev 92854)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html 2011-08-11 16:36:00 UTC (rev 92855)
@@ -54,9 +54,9 @@
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
- <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
+ <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
