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

Unified Diff: chrome/browser/resources/chromeos/keyboard/keyboard_utils.js

Issue 570503002: Compile chrome://settings, part 6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@H_options_errors_4
Patch Set: fix asserts, rebase Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/keyboard/keyboard_utils.js
diff --git a/chrome/browser/resources/chromeos/keyboard/keyboard_utils.js b/chrome/browser/resources/chromeos/keyboard/keyboard_utils.js
index 931b5aa7b89627ad134cfbf7ff6248f114864e09..2369197c3b44fc21535fb825b37b4ce95a33702d 100644
--- a/chrome/browser/resources/chromeos/keyboard/keyboard_utils.js
+++ b/chrome/browser/resources/chromeos/keyboard/keyboard_utils.js
@@ -9,10 +9,12 @@ var keyboard = {};
/**
* Swallows keypress and keyup events of arrow keys.
- * @param {KeyboardEvent} event Raised event.
+ * @param {Event} event Raised event.
* @private
*/
keyboard.onKeyIgnore_ = function(event) {
+ event = /** @type {KeyboardEvent} */(event);
+
if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey)
return;
@@ -27,26 +29,28 @@ keyboard.onKeyIgnore_ = function(event) {
/**
* Converts arrow keys into tab/shift-tab key events.
- * @param {KeyboardEvent} event Raised event.
+ * @param {Event} event Raised event.
* @private
*/
keyboard.onKeyDown_ = function(event) {
- if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey)
- return;
+ event = /** @type {KeyboardEvent} */(event);
- var needsUpDownKeys = event.target.classList.contains('needs-up-down-keys');
+ if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey)
+ return;
- if (event.keyIdentifier == 'Left' ||
- (!needsUpDownKeys && event.keyIdentifier == 'Up')) {
- keyboard.raiseKeyFocusPrevious(document.activeElement);
- event.stopPropagation();
- event.preventDefault();
- } else if (event.keyIdentifier == 'Right' ||
- (!needsUpDownKeys && event.keyIdentifier == 'Down')) {
- keyboard.raiseKeyFocusNext(document.activeElement);
- event.stopPropagation();
- event.preventDefault();
- }
+ var needsUpDownKeys = event.target.classList.contains('needs-up-down-keys');
+
+ if (event.keyIdentifier == 'Left' ||
+ (!needsUpDownKeys && event.keyIdentifier == 'Up')) {
+ keyboard.raiseKeyFocusPrevious(document.activeElement);
+ event.stopPropagation();
+ event.preventDefault();
+ } else if (event.keyIdentifier == 'Right' ||
+ (!needsUpDownKeys && event.keyIdentifier == 'Down')) {
+ keyboard.raiseKeyFocusNext(document.activeElement);
+ event.stopPropagation();
+ event.preventDefault();
+ }
};
/**

Powered by Google App Engine
This is Rietveld 408576698