Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Side by Side Diff: Source/devtools/front_end/SearchableView.js

Issue 203183002: DevTools: Fix find next shortcut on mac and remove it on linux. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com). 3 * Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com).
4 * Copyright (C) 2009 Joseph Pecoraro 4 * Copyright (C) 2009 Joseph Pecoraro
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 return WebInspector.SearchableView._cancelSearchShortcuts; 139 return WebInspector.SearchableView._cancelSearchShortcuts;
140 WebInspector.SearchableView._cancelSearchShortcuts = [WebInspector.KeyboardS hortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Esc)]; 140 WebInspector.SearchableView._cancelSearchShortcuts = [WebInspector.KeyboardS hortcut.makeDescriptor(WebInspector.KeyboardShortcut.Keys.Esc)];
141 return WebInspector.SearchableView._cancelSearchShortcuts; 141 return WebInspector.SearchableView._cancelSearchShortcuts;
142 } 142 }
143 143
144 WebInspector.SearchableView.findNextShortcut = function() 144 WebInspector.SearchableView.findNextShortcut = function()
145 { 145 {
146 if (WebInspector.SearchableView._findNextShortcut) 146 if (WebInspector.SearchableView._findNextShortcut)
147 return WebInspector.SearchableView._findNextShortcut; 147 return WebInspector.SearchableView._findNextShortcut;
148 WebInspector.SearchableView._findNextShortcut = []; 148 WebInspector.SearchableView._findNextShortcut = [];
149 if (!WebInspector.isMac()) 149 if (WebInspector.isMac())
150 WebInspector.SearchableView._findNextShortcut.push(WebInspector.Keyboard Shortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta) ); 150 WebInspector.SearchableView._findNextShortcut.push(WebInspector.Keyboard Shortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.Meta));
151 return WebInspector.SearchableView._findNextShortcut; 151 return WebInspector.SearchableView._findNextShortcut;
152 } 152 }
153 153
154 WebInspector.SearchableView.findPreviousShortcuts = function() 154 WebInspector.SearchableView.findPreviousShortcuts = function()
155 { 155 {
156 if (WebInspector.SearchableView._findPreviousShortcuts) 156 if (WebInspector.SearchableView._findPreviousShortcuts)
157 return WebInspector.SearchableView._findPreviousShortcuts; 157 return WebInspector.SearchableView._findPreviousShortcuts;
158 WebInspector.SearchableView._findPreviousShortcuts = []; 158 WebInspector.SearchableView._findPreviousShortcuts = [];
159 if (!WebInspector.isMac()) 159 if (WebInspector.isMac())
160 WebInspector.SearchableView._findPreviousShortcuts.push(WebInspector.Key boardShortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.CtrlOr Meta | WebInspector.KeyboardShortcut.Modifiers.Shift)); 160 WebInspector.SearchableView._findPreviousShortcuts.push(WebInspector.Key boardShortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.Meta | WebInspector.KeyboardShortcut.Modifiers.Shift));
161 return WebInspector.SearchableView._findPreviousShortcuts; 161 return WebInspector.SearchableView._findPreviousShortcuts;
162 } 162 }
163 163
164 WebInspector.SearchableView.prototype = { 164 WebInspector.SearchableView.prototype = {
165 /** 165 /**
166 * @param {!KeyboardEvent} event 166 * @param {!KeyboardEvent} event
167 */ 167 */
168 _onKeyDown: function(event) 168 _onKeyDown: function(event)
169 { 169 {
170 var shortcutKey = WebInspector.KeyboardShortcut.makeKeyFromEvent(event); 170 var shortcutKey = WebInspector.KeyboardShortcut.makeKeyFromEvent(event);
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 * @param {string} text 535 * @param {string} text
536 */ 536 */
537 replaceSelectionWith: function(text) { }, 537 replaceSelectionWith: function(text) { },
538 538
539 /** 539 /**
540 * @param {string} query 540 * @param {string} query
541 * @param {string} replacement 541 * @param {string} replacement
542 */ 542 */
543 replaceAllWith: function(query, replacement) { } 543 replaceAllWith: function(query, replacement) { }
544 } 544 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698