From f62bee0f0d47947d036e5faf9609185e53d839e6 Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Tue, 17 Apr 2012 13:03:55 +0000 Subject: [PATCH] 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): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114368 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 12 +++++++++++ .../inspector/front-end/ScriptsNavigator.js | 25 ++++++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 5961cdb..e5bcb8c 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2012-04-17 Pavel Feldman + + 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 [EFL][WK2] Fix build break when CONTEXT_MENUS is disabled. diff --git a/Source/WebCore/inspector/front-end/ScriptsNavigator.js b/Source/WebCore/inspector/front-end/ScriptsNavigator.js index 2bde7c0..42deb20 100644 --- a/Source/WebCore/inspector/front-end/ScriptsNavigator.js +++ b/Source/WebCore/inspector/front-end/ScriptsNavigator.js @@ -47,27 +47,34 @@ WebInspector.ScriptsNavigator = function() 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 @@ WebInspector.ScriptsNavigator.prototype = { if ((domain === "" && folderName === "") || !showScriptFolders) return isContentScript ? this._contentScriptsTree : this._scriptsTree; - + var parentFolderElement; if (folderName === "") parentFolderElement = isContentScript ? this._contentScriptsTree : this._scriptsTree; -- 2.7.4