arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent smart albums to be part of a selection #603

Browse Source 
This bug has been introduced by #603
This commit is contained in:
Tobias Reich 2016-08-28 12:51:24 +02:00
parent ff5637a7da
commit d2c7cab3e3
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/scripts/multiselect.js
View File

@ -28,17 +28,10 @@ multiselect.bind = function() {
multiselect.toggleItem = function(object, id) {
if (album.isSmartID(id)) return
let pos = $.inArray(id, multiselect.ids)
if (pos!=-1) {
multiselect.ids.splice(pos, 1)
multiselect.deselect(object)
} else {
multiselect.ids.push(id)
multiselect.select(object)
}
if (pos===-1) multiselect.addItem(object, id)
else multiselect.removeItem(object, id)
}
@ -46,10 +39,22 @@ multiselect.addItem = function(object, id) {
let pos = $.inArray(id, multiselect.ids)
if (pos==-1) {
multiselect.ids.push(id)
multiselect.select(object)
}
if (album.isSmartID(id)) return
if (pos!==-1) return
multiselect.ids.push(id)
multiselect.select(object)
}
multiselect.removeItem = function(object, id) {
let pos = $.inArray(id, multiselect.ids)
if (pos===-1) return
multiselect.ids.splice(pos, 1)
multiselect.deselect(object)
}