Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (156197 => 156198)
--- trunk/Source/WebInspectorUI/ChangeLog 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/ChangeLog 2013-09-20 21:17:31 UTC (rev 156198)
@@ -1,3 +1,35 @@
+2013-09-20 Marcelo Morais <[email protected]>
+
+ Web Inspector: Fix keyboard shortcuts for other platforms
+ https://bugs.webkit.org/show_bug.cgi?id=120657
+
+ Reviewed by Timothy Hatcher.
+
+ Handling keyboard shortcuts according to the current platform.
+
+ * UserInterface/InspectorFrontendHostStub.js:
+ (.WebInspector.InspectorFrontendHostStub.prototype.loadResourceSynchronously):
+ (.WebInspector.InspectorFrontendHostStub.prototype.platform): Added. Return the
+ current platform.
+ * UserInterface/KeyboardShortcut.js:
+ (WebInspector.KeyboardShortcut.Modifier.get CommandOrControl): Added. Created keyboard
+ modifier to return Control or Command key according to current platform.
+ * UserInterface/ContentBrowser.js:
+ (WebInspector.ContentBrowser): Returning Control or Command key for keyboard
+ shortcuts according to current platform.
+ * UserInterface/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel): Ditto.
+ * UserInterface/FindBanner.js:
+ (WebInspector.FindBanner): Ditto.
+ * UserInterface/_javascript_LogViewController.js:
+ (WebInspector._javascript_LogViewController): Ditto.
+ * UserInterface/LogContentView.js:
+ (WebInspector.LogContentView): Ditto.
+ * UserInterface/Main.js:
+ (WebInspector.contentLoaded): Ditto.
+ * UserInterface/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel): Ditto.
+
2013-09-20 Brent Fulgham <[email protected]>
[Windows] Unreviewed gardening. Teach WebInspectorUI.vcxproj folder to
Modified: trunk/Source/WebInspectorUI/UserInterface/ContentBrowser.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/ContentBrowser.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/ContentBrowser.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -38,16 +38,16 @@
this._element.appendChild(this._contentViewContainer.element);
this._findBanner = new WebInspector.FindBanner(this);
- this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "F", this._showFindBanner.bind(this));
+ this._findKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._showFindBanner.bind(this));
this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidShow, this._findBannerDidShow, this);
this._findBanner.addEventListener(WebInspector.FindBanner.Event.DidHide, this._findBannerDidHide, this);
- this._saveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "S", this._save.bind(this));
- this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.Command, "S", this._saveAs.bind(this));
+ this._saveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._save.bind(this));
+ this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this));
if (!disableBackForward) {
- this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this));
- this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this));
+ this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this));
+ this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this));
this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem("back", WebInspector.UIString("Back (%s)").format(this._backKeyboardShortcut.displayName), "Images/BackArrow.svg", 9, 9);
this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this);
Modified: trunk/Source/WebInspectorUI/UserInterface/DebuggerSidebarPanel.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/DebuggerSidebarPanel.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/DebuggerSidebarPanel.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -39,15 +39,15 @@
WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.Resumed, this._debuggerDidResume, this);
WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, this._debuggerActiveCallFrameDidChange, this);
- this._pauseOrResumeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control | WebInspector.KeyboardShortcut.Modifier.Command, "Y", this._debuggerPauseResumeButtonClicked.bind(this));
+ this._pauseOrResumeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "Y", this._debuggerPauseResumeButtonClicked.bind(this));
this._stepOverKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.F6, this._debuggerStepOverButtonClicked.bind(this));
this._stepIntoKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.F7, this._debuggerStepIntoButtonClicked.bind(this));
this._stepOutKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.F8, this._debuggerStepOutButtonClicked.bind(this));
- this._pauseOrResumeAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, WebInspector.KeyboardShortcut.Key.Slash, this._debuggerPauseResumeButtonClicked.bind(this));
- this._stepOverAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, WebInspector.KeyboardShortcut.Key.SingleQuote, this._debuggerStepOverButtonClicked.bind(this));
- this._stepIntoAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, WebInspector.KeyboardShortcut.Key.Semicolon, this._debuggerStepIntoButtonClicked.bind(this));
- this._stepOutAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.Command, WebInspector.KeyboardShortcut.Key.Semicolon, this._debuggerStepOutButtonClicked.bind(this));
+ this._pauseOrResumeAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Slash, this._debuggerPauseResumeButtonClicked.bind(this));
+ this._stepOverAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.SingleQuote, this._debuggerStepOverButtonClicked.bind(this));
+ this._stepIntoAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Semicolon, this._debuggerStepIntoButtonClicked.bind(this));
+ this._stepOutAlternateKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, WebInspector.KeyboardShortcut.Key.Semicolon, this._debuggerStepOutButtonClicked.bind(this));
this._navigationBar = new WebInspector.NavigationBar;
this.element.appendChild(this._navigationBar.element);
Modified: trunk/Source/WebInspectorUI/UserInterface/FindBanner.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/FindBanner.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/FindBanner.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -78,10 +78,10 @@
this._previousSearchValue = "";
this._hideKeyboardShortcut = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape, this.hide.bind(this), this._element);
- this._populateFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "E", this._populateSearchQueryFromSelection.bind(this));
+ this._populateFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "E", this._populateSearchQueryFromSelection.bind(this));
this._populateFindKeyboardShortcut.implicitlyPreventsDefault = false;
- this._findNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "G", this._nextResultButtonClicked.bind(this));
- this._findPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.Command, "G", this._previousResultButtonClicked.bind(this));
+ this._findNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._nextResultButtonClicked.bind(this));
+ this._findPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._previousResultButtonClicked.bind(this));
this._generateButtonsGlyphsIfNeeded();
};
Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorFrontendHostStub.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/InspectorFrontendHostStub.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorFrontendHostStub.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -141,6 +141,11 @@
return null;
},
+ platform: function()
+ {
+ return (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
+ },
+
// Private
_sendPendingMessagesToBackendIfNeeded: function()
Modified: trunk/Source/WebInspectorUI/UserInterface/_javascript_LogViewController.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/_javascript_LogViewController.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/_javascript_LogViewController.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -47,17 +47,17 @@
this._topConsoleGroups = [];
- this.messagesClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "K", this._handleClearShortcut.bind(this));
+ this.messagesClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "K", this._handleClearShortcut.bind(this));
this.messagesAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this._handleClearShortcut.bind(this), this._element);
- this._messagesFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "F", this._handleFindShortcut.bind(this), this._element);
- this._messagesFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "G", this._handleFindNextShortcut.bind(this), this._element);
- this._messagesFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._element);
+ this._messagesFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._handleFindShortcut.bind(this), this._element);
+ this._messagesFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._handleFindNextShortcut.bind(this), this._element);
+ this._messagesFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._element);
this._promptAlternateClearKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Control, "L", this._handleClearShortcut.bind(this), this._prompt.element);
- this._promptFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "F", this._handleFindShortcut.bind(this), this._prompt.element);
- this._promptFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "G", this._handleFindNextShortcut.bind(this), this._prompt.element);
- this._promptFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._prompt.element);
+ this._promptFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._handleFindShortcut.bind(this), this._prompt.element);
+ this._promptFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._handleFindNextShortcut.bind(this), this._prompt.element);
+ this._promptFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._prompt.element);
this.startNewSession();
};
Modified: trunk/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -89,7 +89,12 @@
Shift: 1,
Control: 2,
Option: 4,
- Command: 8
+ Command: 8,
+
+ get CommandOrControl()
+ {
+ return InspectorFrontendHost.platform() === "mac" ? this.Command : this.Control;
+ }
};
WebInspector.Key = function(keyCode, displayName)
Modified: trunk/Source/WebInspectorUI/UserInterface/LogContentView.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/LogContentView.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/LogContentView.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -45,7 +45,7 @@
this.prompt = WebInspector.quickConsole.prompt;
- this._keyboardShortcutCommandA = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "A");
+ this._keyboardShortcutCommandA = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "A");
this._keyboardShortcutEsc = new WebInspector.KeyboardShortcut(null, WebInspector.KeyboardShortcut.Key.Escape);
this._logViewController = new WebInspector._javascript_LogViewController(this.messagesElement, this.element, this.prompt, this, "console-prompt-history");
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/Main.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -178,13 +178,13 @@
this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._sidebarWidthDidChange, this);
this.detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._detailsSidebarPanelSelected, this);
- this._reloadPageKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "R", this._reloadPage.bind(this));
- this._reloadPageIgnoringCacheKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "R", this._reloadPageIgnoringCache.bind(this));
+ this._reloadPageKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "R", this._reloadPage.bind(this));
+ this._reloadPageIgnoringCacheKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "R", this._reloadPageIgnoringCache.bind(this));
- this._inspectModeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "C", this._toggleInspectMode.bind(this));
+ this._inspectModeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "C", this._toggleInspectMode.bind(this));
- this._undoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "Z", this._undoKeyboardShortcut.bind(this));
- this._redoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "Z", this._redoKeyboardShortcut.bind(this));
+ this._undoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "Z", this._undoKeyboardShortcut.bind(this));
+ this._redoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "Z", this._redoKeyboardShortcut.bind(this));
this._undoKeyboardShortcut.implicitlyPreventsDefault = this._redoKeyboardShortcut.implicitlyPreventsDefault = false;
this.undockButtonNavigationItem = new WebInspector.ToggleControlToolbarItem("undock", WebInspector.UIString("Detach into separate window"), "", "Images/Undock.svg", "", 16, 14);
Modified: trunk/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js (156197 => 156198)
--- trunk/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js 2013-09-20 20:53:44 UTC (rev 156197)
+++ trunk/Source/WebInspectorUI/UserInterface/ResourceSidebarPanel.js 2013-09-20 21:17:31 UTC (rev 156198)
@@ -48,7 +48,7 @@
this._searchQuerySetting = new WebInspector.Setting("search-sidebar-query", "");
this._inputElement.value = this._searchQuerySetting.value;
- this._searchKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "F", this._focusSearchField.bind(this));
+ this._searchKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "F", this._focusSearchField.bind(this));
this._localStorageRootTreeElement = null;
this._sessionStorageRootTreeElement = null;
