Commit 11031592 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

DevTools: move front-end files from components to ui.

Review URL: https://codereview.chromium.org/714423005

git-svn-id: svn://svn.chromium.org/blink/trunk@185209 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent ebb44d8d
...@@ -97,34 +97,20 @@ ...@@ -97,34 +97,20 @@
], ],
'devtools_components_js_files': [ 'devtools_components_js_files': [
'front_end/components/breakpointsList.css', 'front_end/components/breakpointsList.css',
'front_end/components/flameChart.css',
'front_end/components/helpScreen.css',
'front_end/components/overviewGrid.css',
'front_end/components/panelEnablerView.css',
'front_end/components/CookiesTable.js', 'front_end/components/CookiesTable.js',
'front_end/components/DockController.js', 'front_end/components/DockController.js',
'front_end/components/DOMBreakpointsSidebarPane.js', 'front_end/components/DOMBreakpointsSidebarPane.js',
'front_end/components/DOMPresentationUtils.js', 'front_end/components/DOMPresentationUtils.js',
'front_end/components/Drawer.js', 'front_end/components/Drawer.js',
'front_end/components/ExecutionContextSelector.js', 'front_end/components/ExecutionContextSelector.js',
'front_end/components/FilterBar.js',
'front_end/components/FilterSuggestionBuilder.js',
'front_end/components/FlameChart.js',
'front_end/components/HandlerRegistry.js', 'front_end/components/HandlerRegistry.js',
'front_end/components/HelpScreen.js',
'front_end/components/InspectElementModeController.js', 'front_end/components/InspectElementModeController.js',
'front_end/components/InspectorView.js', 'front_end/components/InspectorView.js',
'front_end/components/NativeBreakpointsSidebarPane.js', 'front_end/components/NativeBreakpointsSidebarPane.js',
'front_end/components/ObjectPopoverHelper.js', 'front_end/components/ObjectPopoverHelper.js',
'front_end/components/ObjectPropertiesSection.js', 'front_end/components/ObjectPropertiesSection.js',
'front_end/components/OverviewGrid.js',
'front_end/components/Panel.js',
'front_end/components/PropertiesSection.js',
'front_end/components/SearchableView.js',
'front_end/components/Section.js',
'front_end/components/ShortcutsScreen.js', 'front_end/components/ShortcutsScreen.js',
'front_end/components/TargetsComboBoxController.js', 'front_end/components/TargetsComboBoxController.js',
'front_end/components/TimelineGrid.js',
], ],
'devtools_host_js_files': [ 'devtools_host_js_files': [
'front_end/host/InspectorAppHost.js', 'front_end/host/InspectorAppHost.js',
...@@ -230,6 +216,10 @@ ...@@ -230,6 +216,10 @@
'devtools_ui_js_files': [ 'devtools_ui_js_files': [
'front_end/ui/dataGrid.css', 'front_end/ui/dataGrid.css',
'front_end/ui/filter.css', 'front_end/ui/filter.css',
'front_end/ui/flameChart.css',
'front_end/ui/helpScreen.css',
'front_end/ui/overviewGrid.css',
'front_end/ui/panelEnablerView.css',
'front_end/ui/pieChart.css', 'front_end/ui/pieChart.css',
'front_end/ui/ActionRegistry.js', 'front_end/ui/ActionRegistry.js',
'front_end/ui/Checkbox.js', 'front_end/ui/Checkbox.js',
...@@ -241,14 +231,21 @@ ...@@ -241,14 +231,21 @@
'front_end/ui/DOMSyntaxHighlighter.js', 'front_end/ui/DOMSyntaxHighlighter.js',
'front_end/ui/DropDownMenu.js', 'front_end/ui/DropDownMenu.js',
'front_end/ui/EmptyView.js', 'front_end/ui/EmptyView.js',
'front_end/ui/FilterBar.js',
'front_end/ui/FlameChart.js',
'front_end/ui/ForwardedInputEventHandler.js', 'front_end/ui/ForwardedInputEventHandler.js',
'front_end/ui/HelpScreen.js',
'front_end/ui/InplaceEditor.js', 'front_end/ui/InplaceEditor.js',
'front_end/ui/KeyboardShortcut.js', 'front_end/ui/KeyboardShortcut.js',
'front_end/ui/OverviewGrid.js',
'front_end/ui/Panel.js',
'front_end/ui/PieChart.js', 'front_end/ui/PieChart.js',
'front_end/ui/Popover.js', 'front_end/ui/Popover.js',
'front_end/ui/ProgressIndicator.js', 'front_end/ui/ProgressIndicator.js',
'front_end/ui/ResizerWidget.js', 'front_end/ui/ResizerWidget.js',
'front_end/ui/RootView.js', 'front_end/ui/RootView.js',
'front_end/ui/SearchableView.js',
'front_end/ui/Section.js',
'front_end/ui/SettingsUI.js', 'front_end/ui/SettingsUI.js',
'front_end/ui/ShortcutRegistry.js', 'front_end/ui/ShortcutRegistry.js',
'front_end/ui/ShowMoreDataGridNode.js', 'front_end/ui/ShowMoreDataGridNode.js',
...@@ -263,6 +260,7 @@ ...@@ -263,6 +260,7 @@
'front_end/ui/TabbedPane.js', 'front_end/ui/TabbedPane.js',
'front_end/ui/TextEditor.js', 'front_end/ui/TextEditor.js',
'front_end/ui/TextPrompt.js', 'front_end/ui/TextPrompt.js',
'front_end/ui/TimelineGrid.js',
'front_end/ui/UIUtils.js', 'front_end/ui/UIUtils.js',
'front_end/ui/View.js', 'front_end/ui/View.js',
'front_end/ui/ViewportControl.js', 'front_end/ui/ViewportControl.js',
...@@ -407,6 +405,7 @@ ...@@ -407,6 +405,7 @@
'front_end/network/requestCookiesView.css', 'front_end/network/requestCookiesView.css',
'front_end/network/requestHeadersView.css', 'front_end/network/requestHeadersView.css',
'front_end/network/webSocketFrameView.css', 'front_end/network/webSocketFrameView.css',
'front_end/network/FilterSuggestionBuilder.js',
'front_end/network/NetworkItemView.js', 'front_end/network/NetworkItemView.js',
'front_end/network/NetworkPanel.js', 'front_end/network/NetworkPanel.js',
'front_end/network/RequestCookiesView.js', 'front_end/network/RequestCookiesView.js',
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
WebInspector.AuditsPanel = function() WebInspector.AuditsPanel = function()
{ {
WebInspector.PanelWithSidebarTree.call(this, "audits"); WebInspector.PanelWithSidebarTree.call(this, "audits");
this.registerRequiredCSS("components/panelEnablerView.css"); this.registerRequiredCSS("ui/panelEnablerView.css");
this.registerRequiredCSS("audits/auditsPanel.css"); this.registerRequiredCSS("audits/auditsPanel.css");
this.auditsTreeElement = new WebInspector.SidebarSectionTreeElement("", {}, true); this.auditsTreeElement = new WebInspector.SidebarSectionTreeElement("", {}, true);
......
/*
* Copyright (C) 2007 Apple Inc. All rights reserved.
* Copyright (C) 2009 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/**
* @constructor
* @extends {WebInspector.Section}
* @param {string|!Element} title
* @param {string=} subtitle
*/
WebInspector.PropertiesSection = function(title, subtitle)
{
WebInspector.Section.call(this, title, subtitle);
this.headerElement.classList.add("monospace");
this.propertiesElement = createElement("ol");
this.propertiesElement.className = "properties properties-tree monospace";
this.propertiesTreeOutline = new TreeOutline(this.propertiesElement, true);
this.propertiesTreeOutline.setFocusable(false);
this.propertiesTreeOutline.section = this;
this.element.appendChild(this.propertiesElement);
}
WebInspector.PropertiesSection.prototype = {
__proto__: WebInspector.Section.prototype
}
...@@ -9,32 +9,18 @@ ...@@ -9,32 +9,18 @@
"NativeBreakpointsSidebarPane.js", "NativeBreakpointsSidebarPane.js",
"DOMBreakpointsSidebarPane.js", "DOMBreakpointsSidebarPane.js",
"DOMPresentationUtils.js", "DOMPresentationUtils.js",
"Section.js",
"PropertiesSection.js",
"DockController.js", "DockController.js",
"Drawer.js", "Drawer.js",
"Panel.js",
"ExecutionContextSelector.js", "ExecutionContextSelector.js",
"FilterBar.js",
"FilterSuggestionBuilder.js",
"FlameChart.js",
"HandlerRegistry.js", "HandlerRegistry.js",
"HelpScreen.js",
"InspectElementModeController.js", "InspectElementModeController.js",
"InspectorView.js", "InspectorView.js",
"ObjectPopoverHelper.js", "ObjectPopoverHelper.js",
"ObjectPropertiesSection.js", "ObjectPropertiesSection.js",
"OverviewGrid.js",
"SearchableView.js",
"ShortcutsScreen.js", "ShortcutsScreen.js",
"TargetsComboBoxController.js", "TargetsComboBoxController.js"
"TimelineGrid.js"
], ],
"stylesheets": [ "stylesheets": [
"breakpointsList.css", "breakpointsList.css"
"flameChart.css",
"helpScreen.css",
"overviewGrid.css",
"panelEnablerView.css"
] ]
} }
...@@ -885,4 +885,40 @@ WebInspector.Main.InspectedNodeRevealer.prototype = { ...@@ -885,4 +885,40 @@ WebInspector.Main.InspectedNodeRevealer.prototype = {
} }
} }
/**
* @constructor
* @extends {WebInspector.HelpScreen}
*/
WebInspector.RemoteDebuggingTerminatedScreen = function(reason)
{
WebInspector.HelpScreen.call(this, WebInspector.UIString("Detached from the target"));
var p = this.helpContentElement.createChild("p");
p.classList.add("help-section");
p.createChild("span").textContent = WebInspector.UIString("Remote debugging has been terminated with reason: ");
p.createChild("span", "error-message").textContent = reason;
p.createChild("br");
p.createChild("span").textContent = WebInspector.UIString("Please re-attach to the new target.");
}
WebInspector.RemoteDebuggingTerminatedScreen.prototype = {
__proto__: WebInspector.HelpScreen.prototype
}
/**
* @constructor
* @extends {WebInspector.HelpScreen}
*/
WebInspector.WorkerTerminatedScreen = function()
{
WebInspector.HelpScreen.call(this, WebInspector.UIString("Inspected worker terminated"));
var p = this.helpContentElement.createChild("p");
p.classList.add("help-section");
p.textContent = WebInspector.UIString("Inspected worker has terminated. Once it restarts we will attach to it automatically.");
}
WebInspector.WorkerTerminatedScreen.prototype = {
__proto__: WebInspector.HelpScreen.prototype
}
new WebInspector.Main(); new WebInspector.Main();
...@@ -95,7 +95,7 @@ WebInspector.RenderingOptions.prototype = { ...@@ -95,7 +95,7 @@ WebInspector.RenderingOptions.prototype = {
WebInspector.RenderingOptions.View = function() WebInspector.RenderingOptions.View = function()
{ {
WebInspector.VBox.call(this); WebInspector.VBox.call(this);
this.registerRequiredCSS("components/helpScreen.css"); this.registerRequiredCSS("ui/helpScreen.css");
this.element.classList.add("help-indent-labels"); this.element.classList.add("help-indent-labels");
var div = this.element.createChild("div", "settings-tab help-content help-container help-no-columns"); var div = this.element.createChild("div", "settings-tab help-content help-container help-no-columns");
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
], ],
"dependencies": ["source_frame"], "dependencies": ["source_frame"],
"scripts": [ "scripts": [
"FilterSuggestionBuilder.js",
"RequestView.js", "RequestView.js",
"NetworkItemView.js", "NetworkItemView.js",
"RequestCookiesView.js", "RequestCookiesView.js",
......
...@@ -437,7 +437,7 @@ WebInspector.ProfileHeader.prototype = { ...@@ -437,7 +437,7 @@ WebInspector.ProfileHeader.prototype = {
WebInspector.ProfilesPanel = function() WebInspector.ProfilesPanel = function()
{ {
WebInspector.PanelWithSidebarTree.call(this, "profiles"); WebInspector.PanelWithSidebarTree.call(this, "profiles");
this.registerRequiredCSS("components/panelEnablerView.css"); this.registerRequiredCSS("ui/panelEnablerView.css");
this.registerRequiredCSS("profiler/heapProfiler.css"); this.registerRequiredCSS("profiler/heapProfiler.css");
this.registerRequiredCSS("profiler/profilesPanel.css"); this.registerRequiredCSS("profiler/profilesPanel.css");
......
...@@ -57,7 +57,7 @@ WebInspector.FlameChartDelegate.prototype = { ...@@ -57,7 +57,7 @@ WebInspector.FlameChartDelegate.prototype = {
WebInspector.FlameChart = function(dataProvider, flameChartDelegate, isTopDown) WebInspector.FlameChart = function(dataProvider, flameChartDelegate, isTopDown)
{ {
WebInspector.HBox.call(this, true); WebInspector.HBox.call(this, true);
this.contentElement.appendChild(WebInspector.View.createStyleElement("components/flameChart.css")); this.contentElement.appendChild(WebInspector.View.createStyleElement("ui/flameChart.css"));
this.contentElement.classList.add("flame-chart-main-pane"); this.contentElement.classList.add("flame-chart-main-pane");
this._flameChartDelegate = flameChartDelegate; this._flameChartDelegate = flameChartDelegate;
this._isTopDown = isTopDown; this._isTopDown = isTopDown;
......
...@@ -37,7 +37,7 @@ WebInspector.HelpScreen = function(title) ...@@ -37,7 +37,7 @@ WebInspector.HelpScreen = function(title)
{ {
WebInspector.VBox.call(this); WebInspector.VBox.call(this);
this.markAsRoot(); this.markAsRoot();
this.registerRequiredCSS("components/helpScreen.css"); this.registerRequiredCSS("ui/helpScreen.css");
this.element.classList.add("help-window-outer"); this.element.classList.add("help-window-outer");
this.element.addEventListener("keydown", this._onKeyDown.bind(this), false); this.element.addEventListener("keydown", this._onKeyDown.bind(this), false);
...@@ -76,7 +76,7 @@ WebInspector.HelpScreen.prototype = { ...@@ -76,7 +76,7 @@ WebInspector.HelpScreen.prototype = {
visibleHelpScreen.hide(); visibleHelpScreen.hide();
WebInspector.HelpScreen._visibleScreen = this; WebInspector.HelpScreen._visibleScreen = this;
WebInspector.GlassPane.DefaultFocusedViewStack.push(this); WebInspector.GlassPane.DefaultFocusedViewStack.push(this);
this.show(WebInspector.inspectorView.element); this.show(WebInspector.Dialog.modalHostView().element);
this.focus(); this.focus();
}, },
...@@ -115,40 +115,3 @@ WebInspector.HelpScreen.prototype = { ...@@ -115,40 +115,3 @@ WebInspector.HelpScreen.prototype = {
__proto__: WebInspector.VBox.prototype __proto__: WebInspector.VBox.prototype
} }
/**
* @constructor
* @extends {WebInspector.HelpScreen}
*/
WebInspector.RemoteDebuggingTerminatedScreen = function(reason)
{
WebInspector.HelpScreen.call(this, WebInspector.UIString("Detached from the target"));
var p = this.helpContentElement.createChild("p");
p.classList.add("help-section");
p.createChild("span").textContent = WebInspector.UIString("Remote debugging has been terminated with reason: ");
p.createChild("span", "error-message").textContent = reason;
p.createChild("br");
p.createChild("span").textContent = WebInspector.UIString("Please re-attach to the new target.");
}
WebInspector.RemoteDebuggingTerminatedScreen.prototype = {
__proto__: WebInspector.HelpScreen.prototype
}
/**
* @constructor
* @extends {WebInspector.HelpScreen}
*/
WebInspector.WorkerTerminatedScreen = function()
{
WebInspector.HelpScreen.call(this, WebInspector.UIString("Inspected worker terminated"));
var p = this.helpContentElement.createChild("p");
p.classList.add("help-section");
p.textContent = WebInspector.UIString("Inspected worker has terminated. Once it restarts we will attach to it automatically.");
}
WebInspector.WorkerTerminatedScreen.prototype = {
__proto__: WebInspector.HelpScreen.prototype
}
...@@ -171,7 +171,7 @@ WebInspector.OverviewGrid.Window = function(parentElement, dividersLabelBarEleme ...@@ -171,7 +171,7 @@ WebInspector.OverviewGrid.Window = function(parentElement, dividersLabelBarEleme
this._parentElement.addEventListener("dblclick", this._resizeWindowMaximum.bind(this), true); this._parentElement.addEventListener("dblclick", this._resizeWindowMaximum.bind(this), true);
this._overviewWindowElement = parentElement.createChild("div", "overview-grid-window"); this._overviewWindowElement = parentElement.createChild("div", "overview-grid-window");
this._overviewWindowElement.appendChild(WebInspector.View.createStyleElement("components/overviewGrid.css")); this._overviewWindowElement.appendChild(WebInspector.View.createStyleElement("ui/overviewGrid.css"));
this._overviewWindowBordersElement = parentElement.createChild("div", "overview-grid-window-rulers"); this._overviewWindowBordersElement = parentElement.createChild("div", "overview-grid-window-rulers");
parentElement.createChild("div", "overview-grid-dividers-background"); parentElement.createChild("div", "overview-grid-dividers-background");
......
...@@ -218,3 +218,27 @@ WebInspector.Section.prototype = { ...@@ -218,3 +218,27 @@ WebInspector.Section.prototype = {
event.consume(); event.consume();
} }
} }
/**
* @constructor
* @extends {WebInspector.Section}
* @param {string|!Element} title
* @param {string=} subtitle
*/
WebInspector.PropertiesSection = function(title, subtitle)
{
WebInspector.Section.call(this, title, subtitle);
this.headerElement.classList.add("monospace");
this.propertiesElement = createElement("ol");
this.propertiesElement.className = "properties properties-tree monospace";
this.propertiesTreeOutline = new TreeOutline(this.propertiesElement, true);
this.propertiesTreeOutline.setFocusable(false);
this.propertiesTreeOutline.section = this;
this.element.appendChild(this.propertiesElement);
}
WebInspector.PropertiesSection.prototype = {
__proto__: WebInspector.Section.prototype
}
...@@ -18,17 +18,22 @@ ...@@ -18,17 +18,22 @@
"DOMSyntaxHighlighter.js", "DOMSyntaxHighlighter.js",
"DropDownMenu.js", "DropDownMenu.js",
"EmptyView.js", "EmptyView.js",
"TabbedPane.js", "FilterBar.js",
"FlameChart.js",
"ForwardedInputEventHandler.js", "ForwardedInputEventHandler.js",
"HelpScreen.js",
"InplaceEditor.js", "InplaceEditor.js",
"KeyboardShortcut.js", "KeyboardShortcut.js",
"OverviewGrid.js",
"Panel.js",
"PieChart.js", "PieChart.js",
"Popover.js", "Popover.js",
"ProgressIndicator.js", "ProgressIndicator.js",
"ResizerWidget.js", "ResizerWidget.js",
"RootView.js", "RootView.js",
"SearchableView.js",
"Section.js",
"SettingsUI.js", "SettingsUI.js",
"SidebarPane.js",
"SidebarTreeElement.js", "SidebarTreeElement.js",
"ShowMoreDataGridNode.js", "ShowMoreDataGridNode.js",
"SoftContextMenu.js", "SoftContextMenu.js",
...@@ -38,8 +43,11 @@ ...@@ -38,8 +43,11 @@
"StackView.js", "StackView.js",
"StatusBarButton.js", "StatusBarButton.js",
"SuggestBox.js", "SuggestBox.js",
"TabbedPane.js",
"SidebarPane.js",
"TextEditor.js", "TextEditor.js",
"TextPrompt.js", "TextPrompt.js",
"TimelineGrid.js",
"UIUtils.js", "UIUtils.js",
"ViewportControl.js", "ViewportControl.js",
"ZoomManager.js" "ZoomManager.js"
...@@ -47,6 +55,10 @@ ...@@ -47,6 +55,10 @@
"stylesheets": [ "stylesheets": [
"dataGrid.css", "dataGrid.css",
"filter.css", "filter.css",
"flameChart.css",
"helpScreen.css",
"overviewGrid.css",
"panelEnablerView.css",
"pieChart.css" "pieChart.css"
] ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment