Title: [99416] trunk/Source/WebCore
- Revision
- 99416
- Author
- [email protected]
- Date
- 2011-11-07 06:20:23 -0800 (Mon, 07 Nov 2011)
Log Message
Web Inspector: Add advanced search shortcut to ShortcutsScreen.
https://bugs.webkit.org/show_bug.cgi?id=71302
Reviewed by Pavel Feldman.
* English.lproj/localizedStrings.js:
* inspector/front-end/AdvancedSearchController.js:
(WebInspector.AdvancedSearchController.createShortcut):
* inspector/front-end/inspector.js:
(WebInspector._registerShortcuts):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99415 => 99416)
--- trunk/Source/WebCore/ChangeLog 2011-11-07 14:10:56 UTC (rev 99415)
+++ trunk/Source/WebCore/ChangeLog 2011-11-07 14:20:23 UTC (rev 99416)
@@ -1,3 +1,16 @@
+2011-11-07 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: Add advanced search shortcut to ShortcutsScreen.
+ https://bugs.webkit.org/show_bug.cgi?id=71302
+
+ Reviewed by Pavel Feldman.
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/AdvancedSearchController.js:
+ (WebInspector.AdvancedSearchController.createShortcut):
+ * inspector/front-end/inspector.js:
+ (WebInspector._registerShortcuts):
+
2011-11-07 Andreas Kling <[email protected]>
CSSImageValue: Remove inheritance from CachedImageClient.
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js (99415 => 99416)
--- trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2011-11-07 14:10:56 UTC (rev 99415)
+++ trunk/Source/WebCore/inspector/front-end/AdvancedSearchController.js 2011-11-07 14:20:23 UTC (rev 99416)
@@ -41,7 +41,10 @@
WebInspector.AdvancedSearchController.createShortcut = function()
{
- return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta | WebInspector.KeyboardShortcut.Modifiers.Shift);
+ if (WebInspector.isMac())
+ return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.Meta | WebInspector.KeyboardShortcut.Modifiers.Alt);
+ else
+ return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.Ctrl | WebInspector.KeyboardShortcut.Modifiers.Shift);
}
WebInspector.AdvancedSearchController.prototype = {
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (99415 => 99416)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-11-07 14:10:56 UTC (rev 99415)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-11-07 14:20:23 UTC (rev 99416)
@@ -553,6 +553,10 @@
section.addRelatedKeys(keys, WebInspector.UIString("Next/previous panel"));
section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), WebInspector.UIString("Toggle console"));
section.addKey(shortcut.shortcutToString("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search"));
+
+ var advancedSearchShortcut = WebInspector.AdvancedSearchController.createShortcut();
+ section.addKey(advancedSearchShortcut.name, WebInspector.UIString("Search across all scripts"));
+
if (WebInspector.isMac()) {
keys = [
shortcut.shortcutToString("g", shortcut.Modifiers.Meta),
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
