Changeset 217328 in webkit

Timestamp:

May 24, 2017, 12:11:15 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r216562 - [GTK][Win] Web Inspector: Cann't open "Quick Open" dialog by pressing Ctrl+Shift+O
​https://bugs.webkit.org/show_bug.cgi?id=171798

Patch by Fujii Hironori <Fujii Hironori> on 2017-05-09
Reviewed by Michael Catanzaro.

PC can't input the shortcut keys Command+Shift+O and Command+P.

• UserInterface/Base/Main.js:

(WebInspector.contentLoaded): Use CommandOrControl instead of Command.

Location:

releases/WebKitGTK/webkit-2.16/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)

releases/WebKitGTK/webkit-2.16/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-05-09  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [GTK][Win] Web Inspector: Cann't open "Quick Open" dialog by pressing Ctrl+Shift+O
+        https://bugs.webkit.org/show_bug.cgi?id=171798
+
+        Reviewed by Michael Catanzaro.
+
+        PC can't input the shortcut keys Command+Shift+O and Command+P.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.contentLoaded): Use CommandOrControl instead of Command.
+
 2017-05-08  Fujii Hironori  <Hironori.Fujii@sony.com>
 

releases/WebKitGTK/webkit-2.16/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -308 +308 @@
     this._saveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this));
 
-    this.openResourceKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command | WebInspector.KeyboardShortcut.Modifier.Shift, "O", this._showOpenResourceDialog.bind(this));
-    new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Command, "P", this._showOpenResourceDialog.bind(this));
+    this.openResourceKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "O", this._showOpenResourceDialog.bind(this));
+    new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "P", this._showOpenResourceDialog.bind(this));
 
     this.navigationSidebarKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "0", this.toggleNavigationSidebar.bind(this));