diff options
| author | Dan Wellman <danwellman@hotmail.com> | 2011-11-28 08:38:34 +0000 |
|---|---|---|
| committer | Dan Wellman <danwellman@hotmail.com> | 2011-11-28 08:38:34 +0000 |
| commit | a4fd5449b24b998ffa514f01b735da2b6465a80a (patch) | |
| tree | 51b1c2828e85f538775e22cf5e3a930a8c4fe506 /ui/jquery.ui.selectable.js | |
| parent | fce4725a8ac599efab5449710550a029a2d6fbe3 (diff) | |
| parent | 53ea93327e9040b7472e8fd2af2abaea19058e4a (diff) | |
| download | jquery-ui-a4fd5449b24b998ffa514f01b735da2b6465a80a.tar.gz jquery-ui-a4fd5449b24b998ffa514f01b735da2b6465a80a.zip | |
Merge remote-tracking branch 'upstream/selectmenu' into selectmenu
Diffstat (limited to 'ui/jquery.ui.selectable.js')
| -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 d7b24d4e3..408771eff 100644 --- a/ui/jquery.ui.selectable.js +++ b/ui/jquery.ui.selectable.js @@ -104,7 +104,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'); @@ -119,7 +119,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"); @@ -189,7 +189,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'); @@ -208,7 +208,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; |