diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-11-22 08:31:11 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-11-22 08:31:39 -0500 |
| commit | ffd3f510f1c0fbfe99ce2f1aab81d56d9b03f88e (patch) | |
| tree | 1644b0a556da50444d03539b3ff8850e6045bb04 | |
| parent | 63bd71f14cac1f46fd5cfc6f157abf0bf710d347 (diff) | |
| download | jquery-ui-ffd3f510f1c0fbfe99ce2f1aab81d56d9b03f88e.tar.gz jquery-ui-ffd3f510f1c0fbfe99ce2f1aab81d56d9b03f88e.zip | |
Selectable: Explicitly check event.ctrlKey now that jQuery differentiates between meta and ctrl. Fixes #7858 - ctrl-click to select multiple elements not working.
(cherry picked from commit 35dd0417bdb442ad00a9eb37a85db5ddf1b14615)
| -rw-r--r-- | ui/jquery.ui.selectable.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js index 19ed1fbd7..5a02f551a 100644 --- a/ui/jquery.ui.selectable.js +++ b/ui/jquery.ui.selectable.js @@ -103,7 +103,7 @@ $.widget("ui.selectable", $.ui.mouse, { this.selectees.filter('.ui-selected').each(function() { var selectee = $.data(this, "selectable-item"); selectee.startselected = true; - if (!event.metaKey) { + if (!event.metaKey && !event.ctrlKey) { selectee.$element.removeClass('ui-selected'); selectee.selected = false; selectee.$element.addClass('ui-unselecting'); @@ -118,7 +118,7 @@ $.widget("ui.selectable", $.ui.mouse, { $(event.target).parents().andSelf().each(function() { var selectee = $.data(this, "selectable-item"); if (selectee) { - var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected'); + var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected'); selectee.$element .removeClass(doSelect ? "ui-unselecting" : "ui-selected") .addClass(doSelect ? "ui-selecting" : "ui-unselecting"); @@ -188,7 +188,7 @@ $.widget("ui.selectable", $.ui.mouse, { } else { // UNSELECT if (selectee.selecting) { - if (event.metaKey && selectee.startselected) { + if ((event.metaKey || event.ctrlKey) && selectee.startselected) { selectee.$element.removeClass('ui-selecting'); selectee.selecting = false; selectee.$element.addClass('ui-selected'); @@ -207,7 +207,7 @@ $.widget("ui.selectable", $.ui.mouse, { } } if (selectee.selected) { - if (!event.metaKey && !selectee.startselected) { + if (!event.metaKey && !event.ctrlKey && !selectee.startselected) { selectee.$element.removeClass('ui-selected'); selectee.selected = false; |