diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 23:20:08 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 23:20:08 +0000 |
| commit | 60aefa74d94c67a4ce2e8df6f4dd19d3851eab28 (patch) | |
| tree | 11d3b80c3c77ad2be92f681cca4500e9c4468f33 | |
| parent | d52746e14995309c2a7f686d2ca76d45a10c0e65 (diff) | |
| download | chromium_src-60aefa74d94c67a4ce2e8df6f4dd19d3851eab28.zip chromium_src-60aefa74d94c67a4ce2e8df6f4dd19d3851eab28.tar.gz chromium_src-60aefa74d94c67a4ce2e8df6f4dd19d3851eab28.tar.bz2 | |
DOMUI: Fix Shift+Ctrl selection of the list for Windows.
BUG=64964
TEST=1. On Windows go to Bookmarks manager.
2. Go to a folder with multiple bookmarks.
3. Select a bookmark
4. Hold down Shift and Ctrl. Click on another bookmark. All the bookmarks
between the items should also be selected.
Review URL: http://codereview.chromium.org/5780002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69063 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/shared/js/cr/ui/list_selection_controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/resources/shared/js/cr/ui/list_selection_controller.js b/chrome/browser/resources/shared/js/cr/ui/list_selection_controller.js index 3697c9d..72aada6 100644 --- a/chrome/browser/resources/shared/js/cr/ui/list_selection_controller.js +++ b/chrome/browser/resources/shared/js/cr/ui/list_selection_controller.js @@ -137,7 +137,8 @@ cr.define('cr.ui', function() { if (sm.multiple) sm.unselectAll(); } else { - if (sm.multiple && (cr.isMac ? e.metaKey : e.ctrlKey)) { + if (sm.multiple && (cr.isMac ? e.metaKey : + (e.ctrlKey && !e.shiftKey))) { // Selection is handled at mouseUp on windows/linux, mouseDown on mac. if (cr.isMac? isDown : !isDown) { // toggle the current one and make it anchor index |