|
@ -307,7 +307,7 @@ ItemSet.prototype._create = function(){ |
|
|
ItemSet.prototype.setOptions = function(options) { |
|
|
ItemSet.prototype.setOptions = function(options) { |
|
|
if (options) { |
|
|
if (options) { |
|
|
// copy all options that we know
|
|
|
// copy all options that we know
|
|
|
var fields = ['type', 'align', 'order', 'stack', 'selectable', 'multiselect', 'multiselectFiltersGroup', 'groupOrder', 'dataAttributes', 'template', 'groupTemplate', 'hide', 'snap', 'groupOrderSwap']; |
|
|
|
|
|
|
|
|
var fields = ['type', 'align', 'order', 'stack', 'selectable', 'multiselect', 'multiselectPerGroup', 'groupOrder', 'dataAttributes', 'template', 'groupTemplate', 'hide', 'snap', 'groupOrderSwap']; |
|
|
util.selectiveExtend(fields, this.options, options); |
|
|
util.selectiveExtend(fields, this.options, options); |
|
|
|
|
|
|
|
|
if ('orientation' in options) { |
|
|
if ('orientation' in options) { |
|
@ -1763,19 +1763,19 @@ ItemSet.prototype._onMultiSelectItem = function (event) { |
|
|
|
|
|
|
|
|
// when filtering get the group of the last selected item
|
|
|
// when filtering get the group of the last selected item
|
|
|
var lastSelectedGroup = undefined; |
|
|
var lastSelectedGroup = undefined; |
|
|
if (this.options.multiselectFiltersGroup) { |
|
|
|
|
|
|
|
|
if (this.options.multiselectPerGroup) { |
|
|
if (selection.length > 0) { |
|
|
if (selection.length > 0) { |
|
|
lastSelectedGroup = this.itemsData.get(selection[0]).group; |
|
|
lastSelectedGroup = this.itemsData.get(selection[0]).group; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// determine the selection range
|
|
|
// determine the selection range
|
|
|
if (!this.options.multiselectFiltersGroup || lastSelectedGroup == undefined || lastSelectedGroup == itemGroup) { |
|
|
|
|
|
|
|
|
if (!this.options.multiselectPerGroup || lastSelectedGroup == undefined || lastSelectedGroup == itemGroup) { |
|
|
selection.push(item.id); |
|
|
selection.push(item.id); |
|
|
} |
|
|
} |
|
|
var range = ItemSet._getItemRange(this.itemsData.get(selection, this.itemOptions)); |
|
|
var range = ItemSet._getItemRange(this.itemsData.get(selection, this.itemOptions)); |
|
|
|
|
|
|
|
|
if (!this.options.multiselectFiltersGroup || lastSelectedGroup == itemGroup) { |
|
|
|
|
|
|
|
|
if (!this.options.multiselectPerGroup || lastSelectedGroup == itemGroup) { |
|
|
// select all items within the selection range
|
|
|
// select all items within the selection range
|
|
|
selection = []; |
|
|
selection = []; |
|
|
for (var id in this.items) { |
|
|
for (var id in this.items) { |
|
@ -1786,7 +1786,7 @@ ItemSet.prototype._onMultiSelectItem = function (event) { |
|
|
|
|
|
|
|
|
if (start >= range.min && |
|
|
if (start >= range.min && |
|
|
end <= range.max && |
|
|
end <= range.max && |
|
|
(!this.options.multiselectFiltersGroup || lastSelectedGroup == this.itemsData.get(_item.id).group) && |
|
|
|
|
|
|
|
|
(!this.options.multiselectPerGroup || lastSelectedGroup == this.itemsData.get(_item.id).group) && |
|
|
!(_item instanceof BackgroundItem)) { |
|
|
!(_item instanceof BackgroundItem)) { |
|
|
selection.push(_item.id); // do not use id but item.id, id itself is stringified
|
|
|
selection.push(_item.id); // do not use id but item.id, id itself is stringified
|
|
|
} |
|
|
} |
|
|