Title: [114368] trunk/Source/WebCore
- Revision
- 114368
- Author
- pfeld...@chromium.org
- Date
- 2012-04-17 06:03:55 -0700 (Tue, 17 Apr 2012)
Log Message
Web Inspector: [regression r112413]content scripts tree outline is not added to the tab.
https://bugs.webkit.org/show_bug.cgi?id=84146
Reviewed by Vsevolod Vlasov.
Adding the tree to the container.
* inspector/front-end/ScriptsNavigator.js:
(WebInspector.ScriptsNavigator):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114367 => 114368)
--- trunk/Source/WebCore/ChangeLog 2012-04-17 11:56:19 UTC (rev 114367)
+++ trunk/Source/WebCore/ChangeLog 2012-04-17 13:03:55 UTC (rev 114368)
@@ -1,3 +1,15 @@
+2012-04-17 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: [regression r112413]content scripts tree outline is not added to the tab.
+ https://bugs.webkit.org/show_bug.cgi?id=84146
+
+ Reviewed by Vsevolod Vlasov.
+
+ Adding the tree to the container.
+
+ * inspector/front-end/ScriptsNavigator.js:
+ (WebInspector.ScriptsNavigator):
+
2012-04-17 Mariusz Grzegorczyk <marius...@samsung.com>
[EFL][WK2] Fix build break when CONTEXT_MENUS is disabled.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js (114367 => 114368)
--- trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-04-17 11:56:19 UTC (rev 114367)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsNavigator.js 2012-04-17 13:03:55 UTC (rev 114368)
@@ -47,27 +47,34 @@
this._tabbedPane.element.appendChild(this._treeSearchBox);
var scriptsTreeElement = document.createElement("ol");
- var scriptsView = new WebInspector.View();
- scriptsView.element.addStyleClass("fill");
- scriptsView.element.addStyleClass("navigator-container");
+ this._scriptsTree = new WebInspector.NavigatorTreeOutline(this, scriptsTreeElement);
+
var scriptsOutlineElement = document.createElement("div");
scriptsOutlineElement.addStyleClass("outline-disclosure");
scriptsOutlineElement.addStyleClass("navigator");
scriptsOutlineElement.appendChild(scriptsTreeElement);
+
+ var scriptsView = new WebInspector.View();
+ scriptsView.element.addStyleClass("fill");
+ scriptsView.element.addStyleClass("navigator-container");
scriptsView.element.appendChild(scriptsOutlineElement);
- this._scriptsTree = new WebInspector.NavigatorTreeOutline(this, scriptsTreeElement);
+
this._tabbedPane.appendTab(WebInspector.ScriptsNavigator.ScriptsTab, WebInspector.UIString("Scripts"), scriptsView);
this._tabbedPane.selectTab(WebInspector.ScriptsNavigator.ScriptsTab);
var contentScriptsTreeElement = document.createElement("ol");
- var contentScriptsView = new WebInspector.View();
- contentScriptsView.element.addStyleClass("fill");
- contentScriptsView.element.addStyleClass("navigator-container");
+ this._contentScriptsTree = new WebInspector.NavigatorTreeOutline(this, contentScriptsTreeElement);
+
var contentScriptsOutlineElement = document.createElement("div");
contentScriptsOutlineElement.addStyleClass("outline-disclosure");
contentScriptsOutlineElement.addStyleClass("navigator");
contentScriptsOutlineElement.appendChild(contentScriptsTreeElement);
- this._contentScriptsTree = new WebInspector.NavigatorTreeOutline(this, contentScriptsTreeElement);
+
+ var contentScriptsView = new WebInspector.View();
+ contentScriptsView.element.addStyleClass("fill");
+ contentScriptsView.element.addStyleClass("navigator-container");
+ contentScriptsView.element.appendChild(contentScriptsOutlineElement);
+
this._tabbedPane.appendTab(WebInspector.ScriptsNavigator.ContentScriptsTab, WebInspector.UIString("Content scripts"), contentScriptsView);
this._snippetsTree = this._createSnippetsTree();
@@ -472,7 +479,7 @@
if ((domain === "" && folderName === "") || !showScriptFolders)
return isContentScript ? this._contentScriptsTree : this._scriptsTree;
-
+
var parentFolderElement;
if (folderName === "")
parentFolderElement = isContentScript ? this._contentScriptsTree : this._scriptsTree;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
