diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-24 11:25:24 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-24 11:25:24 +0100 |
| commit | 9bd08798c27f849b85a75bcaca009df85a48545f (patch) | |
| tree | fe70613527b58aba17a1f9760dcda6771fffe4f0 /ui/jquery.ui.selectable.js | |
| parent | d97b6db2cdcc2adf88381c3d7a7d733ea51fab71 (diff) | |
| parent | 74a3f2ce0897ce8bdcac2acc997e68e3e8603121 (diff) | |
| download | jquery-ui-9bd08798c27f849b85a75bcaca009df85a48545f.tar.gz jquery-ui-9bd08798c27f849b85a75bcaca009df85a48545f.zip | |
Merge branch 'master' 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; |