Modified: trunk/Source/WebCore/ChangeLog (137153 => 137154)
--- trunk/Source/WebCore/ChangeLog 2012-12-10 15:16:10 UTC (rev 137153)
+++ trunk/Source/WebCore/ChangeLog 2012-12-10 15:20:30 UTC (rev 137154)
@@ -1,3 +1,29 @@
+2012-12-10 Pavel Feldman <pfeld...@chromium.org>
+
+ Web Inspector: remove the Overrides / Settings context menu from gear icon
+ https://bugs.webkit.org/show_bug.cgi?id=104546
+
+ Reviewed by Alexander Pavlov.
+
+ It sounds like too many people don't like the way it works. Bringing things back: overrides will be a tab in settings for now.
+ Moving present behavior to under experiment.
+
+ * inspector/front-end/OverridesView.js:
+ (WebInspector.OverridesView):
+ * inspector/front-end/Settings.js:
+ (WebInspector.ExperimentsSettings):
+ * inspector/front-end/SettingsScreen.js:
+ (WebInspector.OverridesSettingsTab):
+ (WebInspector.SettingsController):
+ (WebInspector.SettingsController.prototype.get statusBarItem):
+ (WebInspector.SettingsController.prototype._mouseDown.showSettings):
+ (WebInspector.SettingsController.prototype._mouseDown):
+ (WebInspector.SettingsController.prototype._mouseUp):
+ * inspector/front-end/helpScreen.css:
+ (#settings-screen .tabbed-pane-header):
+ (#settings-screen .tabbed-pane-header-tabs):
+ (#settings-screen .tabbed-pane-header-tab):
+
2012-12-10 Kent Tamura <tk...@chromium.org>
Visual order of empty value placeholder in INPUT_MULTIPLE_FIELDS_UI is wrong in RTL
Modified: trunk/Source/WebCore/inspector/front-end/OverridesView.js (137153 => 137154)
--- trunk/Source/WebCore/inspector/front-end/OverridesView.js 2012-12-10 15:16:10 UTC (rev 137153)
+++ trunk/Source/WebCore/inspector/front-end/OverridesView.js 2012-12-10 15:20:30 UTC (rev 137154)
@@ -52,6 +52,7 @@
headerTitle.appendChild(document.createTextNode(WebInspector.UIString("Overrides")));
var container = paneContent.createChild("div", "help-container-wrapper").createChild("div", "settings-tab help-content help-container");
+ this.containerElement = container;
appendBlockTo(container, this._createUserAgentControl());
if (Capabilities.canOverrideDeviceMetrics)
appendBlockTo(container, this._createDeviceMetricsControl());
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (137153 => 137154)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2012-12-10 15:16:10 UTC (rev 137153)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2012-12-10 15:20:30 UTC (rev 137154)
@@ -206,6 +206,7 @@
this.sass = this._createExperiment("sass", "Support for Sass");
this.codemirror = this._createExperiment("codemirror", "Use CodeMirror editor");
this.cssRegions = this._createExperiment("cssRegions", "CSS Regions Support");
+ this.showOverridesInDrawer = this._createExperiment("showOverridesInDrawer", "Show Overrides in drawer");
this._cleanUpSetting();
}
Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (137153 => 137154)
--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2012-12-10 15:16:10 UTC (rev 137153)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js 2012-12-10 15:20:30 UTC (rev 137154)
@@ -49,6 +49,8 @@
this._tabbedPane.element.insertBefore(settingsLabelElement, this._tabbedPane.element.firstChild);
this._tabbedPane.element.appendChild(this._createCloseButton());
this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.General, WebInspector.UIString("General"), new WebInspector.GenericSettingsTab());
+ if (!WebInspector.experimentsSettings.showOverridesInDrawer.isEnabled())
+ this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.Overrides, WebInspector.UIString("Overrides"), new WebInspector.OverridesSettingsTab());
if (WebInspector.experimentsSettings.experimentsEnabled)
this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.Experiments, WebInspector.UIString("Experiments"), new WebInspector.ExperimentsSettingsTab());
this._tabbedPane.appendTab(WebInspector.SettingsScreen.Tabs.Shortcuts, WebInspector.UIString("Shortcuts"), WebInspector.shortcutsScreen.createShortcutsTabView());
@@ -62,6 +64,7 @@
WebInspector.SettingsScreen.Tabs = {
General: "general",
+ Overrides: "overrides",
Experiments: "experiments",
Shortcuts: "shortcuts"
}
@@ -416,6 +419,23 @@
* @constructor
* @extends {WebInspector.SettingsTab}
*/
+WebInspector.OverridesSettingsTab = function()
+{
+ WebInspector.SettingsTab.call(this, WebInspector.UIString("Overrides"), "overrides-tab-content");
+ this._view = new WebInspector.OverridesView();
+ this.containerElement.parentElement.appendChild(this._view.containerElement);
+ this.containerElement.remove();
+ this.containerElement = this._view.containerElement;
+}
+
+WebInspector.OverridesSettingsTab.prototype = {
+ __proto__: WebInspector.SettingsTab.prototype
+}
+
+/**
+ * @constructor
+ * @extends {WebInspector.SettingsTab}
+ */
WebInspector.ExperimentsSettingsTab = function()
{
WebInspector.SettingsTab.call(this, WebInspector.UIString("Experiments"), "experiments-tab-content");
@@ -469,29 +489,32 @@
/**
* @constructor
- * @implements {WebInspector.ContextMenu.Provider}
*/
WebInspector.SettingsController = function()
{
this._statusBarButton = new WebInspector.StatusBarButton(WebInspector.UIString("Settings"), "settings-status-bar-item");
- this._statusBarButton.element.addEventListener("mousedown", this._buttonPressed.bind(this), false);
+ if (WebInspector.experimentsSettings.showOverridesInDrawer.isEnabled())
+ this._statusBarButton.element.addEventListener("mousedown", this._mouseDown.bind(this), false);
+ else
+ this._statusBarButton.element.addEventListener("mouseup", this._mouseUp.bind(this), false);
/** @type {?WebInspector.SettingsScreen} */
this._settingsScreen;
-
- WebInspector.ContextMenu.registerProvider(this);
}
WebInspector.SettingsController.prototype =
{
+ get statusBarItem()
+ {
+ return this._statusBarButton.element;
+ },
+
/**
- * @override
+ * @param {Event} event
*/
- appendApplicableItems: function(event, contextMenu, target)
+ _mouseDown: function(event)
{
- if (target !== this._statusBarButton.element)
- return;
-
+ var contextMenu = new WebInspector.ContextMenu(event);
contextMenu.appendItem(WebInspector.UIString("Overrides"), showOverrides.bind(this));
contextMenu.appendItem(WebInspector.UIString("Settings"), showSettings.bind(this));
@@ -507,21 +530,16 @@
if (!this._settingsScreenVisible)
this.showSettingsScreen();
}
- },
- get statusBarItem()
- {
- return this._statusBarButton.element;
+ contextMenu.showSoftMenu();
},
/**
* @param {Event} event
*/
- _buttonPressed: function(event)
+ _mouseUp: function(event)
{
- var menu = new WebInspector.ContextMenu(event);
- menu.appendApplicableItems(event.currentTarget);
- menu.showSoftMenu();
+ this.showSettingsScreen(WebInspector.SettingsScreen.Tabs.General);
},
_onHideSettingsScreen: function()
Modified: trunk/Source/WebCore/inspector/front-end/helpScreen.css (137153 => 137154)
--- trunk/Source/WebCore/inspector/front-end/helpScreen.css 2012-12-10 15:16:10 UTC (rev 137153)
+++ trunk/Source/WebCore/inspector/front-end/helpScreen.css 2012-12-10 15:20:30 UTC (rev 137154)
@@ -299,7 +299,7 @@
#settings-screen .tabbed-pane-header {
border: none transparent;
height: auto;
- width: 120px;
+ width: 110px;
position: relative;
top: 14px;
}
@@ -310,17 +310,14 @@
#settings-screen .tabbed-pane-header-tabs {
padding-top: 5px;
- width: 120px;
+ width: 100px;
}
#settings-screen .tabbed-pane-header-tab {
background-color: transparent;
border: none transparent;
cursor: pointer;
- float: none;
font-weight: normal;
- position: relative;
- top: 1px;
text-shadow: none;
color: #999999;
height: 22px;
