summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Xavier <leo@Skipper.local>2010-09-10 18:48:47 +0800
committerMichael Leibman <michael.leibman@gmail.com>2010-09-11 02:06:56 +0800
commit9dda1345c439274ec70c7e5290c03785bb252ee8 (patch)
tree9550514c6a2f42cf65c068ef182523d6a9fccc81
parente768e395293da000c5d0e70e29bac3b458471eac (diff)
downloadSlickGrid-9dda1345c439274ec70c7e5290c03785bb252ee8.zip
SlickGrid-9dda1345c439274ec70c7e5290c03785bb252ee8.tar.gz
SlickGrid-9dda1345c439274ec70c7e5290c03785bb252ee8.tar.bz2
Added metaKey to allow Ctrl-select behaviour on OS X
-rw-r--r--slick.grid.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/slick.grid.js b/slick.grid.js
index 7f53536..fd954d5 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -1701,14 +1701,14 @@ if (!jQuery.fn.drag) {
var selection = getSelectedRows();
var idx = $.inArray(row, selection);
- if (!e.ctrlKey && !e.shiftKey) {
+ if (!e.ctrlKey && !e.shiftKey && !e.metaKey) {
selection = [row];
}
else if (options.multiSelect) {
- if (idx === -1 && e.ctrlKey) {
+ if (idx === -1 && (e.ctrlKey || e.metaKey)) {
selection.push(row);
}
- else if (idx !== -1 && e.ctrlKey) {
+ else if (idx !== -1 && (e.ctrlKey || e.metaKey)) {
selection = $.grep(selection, function(o, i) { return (o !== row); });
}
else if (selection.length && e.shiftKey) {