summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 00:16:36 +0000
committerfeldstein@chromium.org <feldstein@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 00:16:36 +0000
commit50d8766af20bd48bce1094039153291e31c0e0bf (patch)
tree8b3f05c683f991ead29039b36f24d22066fdea37 /chrome/browser
parentf071548404a9d3b6645b9dd4278fb04d20a4073b (diff)
downloadchromium_src-50d8766af20bd48bce1094039153291e31c0e0bf.zip
chromium_src-50d8766af20bd48bce1094039153291e31c0e0bf.tar.gz
chromium_src-50d8766af20bd48bce1094039153291e31c0e0bf.tar.bz2
Add multiple item selection to BMM on mac
BMM was originally only checking for the control key on non-mac platforms. BUG=39085 TEST=Select some non-contiguous bookmarks and copy and paste them, without the elements in between Review URL: http://codereview.chromium.org/1225001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js b/chrome/browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js
index 385c80f..70c261f 100644
--- a/chrome/browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js
+++ b/chrome/browser/resources/bookmark_manager/js/cr/ui/listselectionmodel.js
@@ -113,9 +113,9 @@ cr.define('cr.ui', function() {
this.clear();
} else {
var isDown = e.type == 'mousedown';
- if (!cr.isMac && e.ctrlKey) {
- // Handle ctrlKey on mouseup
- if (!isDown) {
+ if (cr.isMac ? e.metaKey : e.ctrlKey) {
+ // Selection is handled at mouseUp on windows/linux, mouseDown on mac.
+ if (cr.isMac? isDown : !isDown) {
// toggle the current one and make it anchor item
this.setItemSelected(item, !this.getItemSelected(item));
this.leadItem = item;