Changeset 143224 in webkit
- Timestamp:
- Feb 18, 2013 8:41:30 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r143223 r143224 1 2013-02-18 Pavel Feldman <pfeldman@chromium.org> 2 3 Web Inspector: hide vertical-sidebar-split in dock-to-right mode behind single experimental flag. 4 https://bugs.webkit.org/show_bug.cgi?id=110119 5 6 Reviewed by Vsevolod Vlasov. 7 8 Removed context menus, made it toggle automatically upon dock orientation change. 9 10 * inspector/front-end/DockController.js: 11 (WebInspector.DockController.prototype._toggleDockState): 12 * inspector/front-end/ElementsPanel.js: 13 (WebInspector.ElementsPanel): 14 (WebInspector.ElementsPanel.prototype._sidebarContextMenuEventFired): 15 (WebInspector.ElementsPanel.prototype._dockSideChanged): 16 (WebInspector.ElementsPanel.prototype._setVerticalSplit): 17 * inspector/front-end/ScriptsPanel.js: 18 (WebInspector.ScriptsPanel): 19 (WebInspector.ScriptsPanel.prototype._appendUISourceCodeItems): 20 (WebInspector.ScriptsPanel.prototype._dockSideChanged): 21 * inspector/front-end/Settings.js: 22 (WebInspector.ExperimentsSettings): 23 * inspector/front-end/inspector.css: 24 * inspector/front-end/scriptsPanel.css: 25 (#scripts-sidebar-stack-pane): 26 (div.sidebar-pane-stack#scripts-debug-sidebar-contents): 27 * inspector/front-end/tabbedPane.css: 28 (.tabbed-pane): 29 1 30 2013-02-18 ChangSeok Oh <shivamidow@gmail.com> 2 31 -
trunk/Source/WebCore/inspector/front-end/DockController.js
r141768 r143224 31 31 /** 32 32 * @constructor 33 * @extends {WebInspector.Object} 33 34 */ 34 35 WebInspector.DockController = function() … … 49 50 DockedToRight: "right", 50 51 Undocked: "undocked" 52 } 53 54 WebInspector.DockController.Events = { 55 DockSideChanged: "DockSideChanged" 51 56 } 52 57 … … 85 90 WebInspector.userMetrics.WindowUndocked.record(); 86 91 this._updateUI(); 92 this.dispatchEventToListeners(WebInspector.DockController.Events.DockSideChanged, this._dockSide); 87 93 }, 88 94 … … 183 189 } 184 190 InspectorFrontendHost.requestSetDockSide(action); 185 } 191 }, 192 193 __proto__: WebInspector.Object.prototype 186 194 } 187 195 -
trunk/Source/WebCore/inspector/front-end/ElementsPanel.js
r143006 r143224 96 96 this.sidebarPanes.metrics.addEventListener("metrics edited", this._metricsPaneEdited, this); 97 97 98 this._splitDirectionSetting = WebInspector.settings.createSetting(this.name + "PanelSplitHorizontally", false); 99 this._splitDirectionSetting.addChangeListener(this._arrangeSidebarPanes.bind(this)); 100 101 this._splitSidebarSetting = WebInspector.settings.createSetting(this.name + "PanelSplitSidebar", false); 102 this._splitSidebarSetting.addChangeListener(this._arrangeSidebarPanes.bind(this)); 103 104 this._arrangeSidebarPanes(); 98 WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._dockSideChanged.bind(this)); 99 this._dockSideChanged(); 105 100 106 101 this._popoverHelper = new WebInspector.PopoverHelper(this.element, this._getPopoverAnchor.bind(this), this._showPopover.bind(this)); … … 352 347 contextMenu.appendSeparator(); 353 348 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Word wrap" : "Word Wrap"), toggleWordWrap.bind(this), WebInspector.settings.domWordWrap.get()); 354 355 this._populateContextMenuForSidebar(contextMenu);356 349 357 350 contextMenu.show(); … … 1098 1091 { 1099 1092 var contextMenu = new WebInspector.ContextMenu(event); 1100 this._populateContextMenuForSidebar(contextMenu);1101 1093 contextMenu.show(); 1102 1094 }, 1103 1095 1104 _populateContextMenuForSidebar: function(contextMenu) 1105 { 1106 if (!WebInspector.experimentsSettings.horizontalPanelSplit.isEnabled()) 1107 return; 1108 1109 function toggleSetting(setting) 1110 { 1111 setting.set(!setting.get()); 1112 } 1113 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Split horizontally" : "Split Horizontally"), toggleSetting.bind(this, this._splitDirectionSetting), this._splitDirectionSetting.get()); 1114 1115 if (!this.splitView.isVertical()) 1116 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Split sidebar" : "Split Sidebar"), toggleSetting.bind(this, this._splitSidebarSetting), this._splitSidebarSetting.get()); 1117 }, 1118 1119 _arrangeSidebarPanes: function() 1120 { 1096 _dockSideChanged: function() 1097 { 1098 var dockSide = WebInspector.dockController.dockSide(); 1099 this._setVerticalSplit(dockSide !== WebInspector.DockController.State.DockedToRight); 1100 }, 1101 1102 /** 1103 * @param {boolean} vertical 1104 */ 1105 _setVerticalSplit: function(vertical) 1106 { 1107 if (this.sidebarPaneView && vertical === this.splitView.isVertical()) 1108 return; 1109 1121 1110 if (this.sidebarPaneView) 1122 1111 this.sidebarPaneView.detach(); 1123 1112 1124 var vertical = !WebInspector.experimentsSettings.horizontalPanelSplit.isEnabled() || !this._splitDirectionSetting.get();1125 1113 this.splitView.setVertical(vertical); 1126 1114 1127 1115 if (vertical) { 1128 1116 this.sidebarPaneView = new WebInspector.SidebarPaneStack(); 1129 for (var pane in this.sidebarPanes)1130 this.sidebarPaneView.addPane(this.sidebarPanes[pane]);1131 } else if (!this._splitSidebarSetting.get()) {1132 this.sidebarPaneView = new WebInspector.SidebarTabbedPane();1133 1117 for (var pane in this.sidebarPanes) 1134 1118 this.sidebarPaneView.addPane(this.sidebarPanes[pane]); -
trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js
r143184 r143224 75 75 this.splitView.setMinimumMainWidthPercent(minimumDebugSidebarWidthPercent); 76 76 77 this.sidebarElement.appendChild(this.debugToolbar);78 79 77 this.debugSidebarResizeWidgetElement = document.createElement("div"); 80 78 this.debugSidebarResizeWidgetElement.id = "scripts-debug-sidebar-resizer-widget"; … … 108 106 109 107 this.splitView.mainElement.appendChild(this.debugSidebarResizeWidgetElement); 110 this.splitView.mainElement.addEventListener("contextmenu", this._contextMenuEventFired.bind(this), false);111 112 this.splitView.sidebarElement.addEventListener("contextmenu", this._sidebarContextMenuEventFired.bind(this), false);113 108 114 109 this.sidebarPanes = {}; … … 126 121 } 127 122 128 this._splitDirectionSetting = WebInspector.settings.createSetting(this.name + "PanelSplitHorizontally", false); 129 this._splitDirectionSetting.addChangeListener(this._arrangeSidebarPanes.bind(this)); 130 131 this._splitSidebarSetting = WebInspector.settings.createSetting(this.name + "PanelSplitSidebar", false); 132 this._splitSidebarSetting.addChangeListener(this._arrangeSidebarPanes.bind(this)); 133 134 this._arrangeSidebarPanes(); 123 WebInspector.dockController.addEventListener(WebInspector.DockController.Events.DockSideChanged, this._dockSideChanged.bind(this)); 124 this._dockSideChanged(); 135 125 136 126 this.sidebarPanes.callstack.registerShortcuts(this.registerShortcuts.bind(this)); … … 1121 1111 if (resource && resource.request) 1122 1112 contextMenu.appendApplicableItems(resource.request); 1123 1124 if (WebInspector.inspectorView.currentPanel() === this)1125 this._populateContextMenuForSidebar(contextMenu);1126 1113 }, 1127 1114 … … 1162 1149 }, 1163 1150 1164 _contextMenuEventFired: function(event) 1165 { 1166 var contextMenu = new WebInspector.ContextMenu(event); 1167 this._populateContextMenuForSidebar(contextMenu); 1168 contextMenu.show(); 1169 }, 1170 1171 _sidebarContextMenuEventFired: function(event) 1172 { 1173 var contextMenu = new WebInspector.ContextMenu(event); 1174 this._populateContextMenuForSidebar(contextMenu); 1175 contextMenu.show(); 1176 }, 1177 1178 _populateContextMenuForSidebar: function(contextMenu) 1179 { 1180 if (!WebInspector.experimentsSettings.horizontalPanelSplit.isEnabled()) 1181 return; 1182 1183 function toggleSetting(setting) 1184 { 1185 setting.set(!setting.get()); 1186 } 1187 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Split horizontally" : "Split Horizontally"), toggleSetting.bind(this, this._splitDirectionSetting), this._splitDirectionSetting.get()); 1188 1189 if (!this.splitView.isVertical()) 1190 contextMenu.appendCheckboxItem(WebInspector.UIString(WebInspector.useLowerCaseMenuTitles() ? "Split sidebar" : "Split Sidebar"), toggleSetting.bind(this, this._splitSidebarSetting), this._splitSidebarSetting.get()); 1191 }, 1192 1193 _arrangeSidebarPanes: function() 1194 { 1151 _dockSideChanged: function() 1152 { 1153 var dockSide = WebInspector.dockController.dockSide(); 1154 this._setVerticalSplit(dockSide !== WebInspector.DockController.State.DockedToRight); 1155 }, 1156 1157 /** 1158 * @param {boolean} vertical 1159 */ 1160 _setVerticalSplit: function(vertical) 1161 { 1162 if (this.sidebarPaneView && vertical === this.splitView.isVertical()) 1163 return; 1164 1195 1165 if (this.sidebarPaneView) 1196 1166 this.sidebarPaneView.detach(); 1197 1167 1198 var vertical = !WebInspector.experimentsSettings.horizontalPanelSplit.isEnabled() || !this._splitDirectionSetting.get();1199 1168 this.splitView.setVertical(vertical); 1200 1169 … … 1203 1172 for (var pane in this.sidebarPanes) 1204 1173 this.sidebarPaneView.addPane(this.sidebarPanes[pane]); 1205 } else if (!this._splitSidebarSetting.get()) { 1206 this.sidebarPaneView = new WebInspector.SidebarTabbedPane(); 1207 for (var pane in this.sidebarPanes) 1208 this.sidebarPaneView.addPane(this.sidebarPanes[pane]); 1174 1175 this.sidebarElement.appendChild(this.debugToolbar); 1209 1176 } else { 1210 1177 this.sidebarPaneView = new WebInspector.SplitView(true, this.name + "PanelSplitSidebarRatio", 0.5); … … 1212 1179 var group1 = new WebInspector.SidebarPaneStack(); 1213 1180 group1.show(this.sidebarPaneView.firstElement()); 1181 group1.element.id = "scripts-sidebar-stack-pane"; 1214 1182 group1.addPane(this.sidebarPanes.watchExpressions); 1215 1183 group1.addPane(this.sidebarPanes.callstack); … … 1222 1190 group2.addPane(this.sidebarPanes.xhrBreakpoints); 1223 1191 group2.addPane(this.sidebarPanes.eventListenerBreakpoints); 1192 1193 this.sidebarPaneView.firstElement().appendChild(this.debugToolbar); 1224 1194 } 1225 1195 -
trunk/Source/WebCore/inspector/front-end/Settings.js
r142983 r143224 213 213 this.showOverridesInDrawer = this._createExperiment("showOverridesInDrawer", "Show Overrides in drawer"); 214 214 this.fileSystemProject = this._createExperiment("fileSystemProject", "File system folders in Sources Panel"); 215 this.horizontalPanelSplit = this._createExperiment("horizontalPanelSplit", "Allow horizontal split in Elements and Sources panels");216 215 this.showWhitespaceInEditor = this._createExperiment("showWhitespaceInEditor", "Show whitespace characters in editor"); 217 216 this.textEditorSmartBraces = this._createExperiment("textEditorSmartBraces", "Enable smart braces in text editor"); -
trunk/Source/WebCore/inspector/front-end/inspector.css
r142132 r143224 2017 2017 } 2018 2018 2019 body.inactive .panel-enabler-view button:not(.status-bar-item), .panel-enabler-view button:disabled:not(.status-bar-item), body.inactive .pane-title-button, .pane-title-button:disabled, body.inactive button.show-all-nodes {2020 color: rgb(130, 130, 130);2021 border-color: rgb(212, 212, 212);2022 background-color: rgb(239, 239, 239);2023 background-image: -webkit-gradient(linear, left top, left bottom, from(rgb(250, 250, 250)), to(rgb(235, 235, 235)));2024 }2025 2026 2019 button.enable-toggle-status-bar-item .glyph { 2027 2020 -webkit-mask-position: -192px 0; -
trunk/Source/WebCore/inspector/front-end/scriptsPanel.css
r127242 r143224 63 63 } 64 64 65 #scripts-debug-sidebar-contents {66 position: absolute;67 top: 22px;68 bottom: 0;69 left: 0;70 right: 0;71 overflow: auto;72 }73 74 65 #scripts-editor-toolbar { 75 66 position: relative; … … 308 299 -webkit-mask-position: -16px -16px; 309 300 } 301 302 #scripts-sidebar-stack-pane { 303 overflow: auto; 304 top: 23px; 305 } 306 307 div.sidebar-pane-stack#scripts-debug-sidebar-contents { 308 top: 23px; 309 }
Note: See TracChangeset
for help on using the changeset viewer.