Index: chrome/browser/resources/options/cookies_view.js |
diff --git a/chrome/browser/resources/options/cookies_view.js b/chrome/browser/resources/options/cookies_view.js |
index 93d2967aa0c199ec340b33936e97f141b1bea75c..27b82abe1e22e9bcb8495483f415da77cc57b2bb 100644 |
--- a/chrome/browser/resources/options/cookies_view.js |
+++ b/chrome/browser/resources/options/cookies_view.js |
@@ -32,7 +32,7 @@ cr.define('options', function() { |
options.CookiesTree.decorate(cookiesTree); |
cookiesTree.addEventListener('change', |
this.handleCookieTreeChange_.bind(this)); |
- cookiesTree.addEventListener('keydown', this.handleKeyDown_); |
+ cookiesTree.addEventListener('keydown', this.handleKeyDown_.bind(this)); |
$('cookiesSearchBox').addEventListener('keydown', |
this.handleQueryEditKeyDown_.bind(this)); |
@@ -44,8 +44,7 @@ cr.define('options', function() { |
} |
$('remove-cookie').onclick = function(e) { |
- var selected = cookiesTree.selectedItem; |
- chrome.send('removeCookie', [selected.pathId]); |
+ self.removeSelectedCookie_(); |
} |
$('remove-all-cookie').onclick = function(e) { |
@@ -234,6 +233,16 @@ cr.define('options', function() { |
}, |
/** |
+ * Remove currently selected cookie. |
+ * @private |
+ */ |
+ removeSelectedCookie_: function() { |
+ var selected = cookiesTree.selectedItem; |
+ if (selected) |
+ chrome.send('removeCookie', [selected.pathId]); |
+ }, |
+ |
+ /** |
* Handler for keydown event. |
* @private |
* @param {Event} e KeyDown event. |
@@ -244,9 +253,12 @@ cr.define('options', function() { |
if (!$('remove-cookie').disabled && |
(e.keyIdentifier == 'U+007F' || |
(cr.isMac && e.keyIdentifier == 'U+0008'))) { |
+ // No further key handling to avoid navigation triggered by 'Backspace' |
+ // on Mac. |
arv (Not doing code reviews)
2010/12/13 20:57:29
Then you can remove the stopPropagation.
xiyuan
2010/12/13 21:12:34
Done.
|
e.preventDefault(); |
e.stopPropagation(); |
- cr.dispatchSimpleEvent($('remove-cookie'), 'click'); |
+ |
+ this.removeSelectedCookie_(); |
} |
} |
}; |