flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-30 02:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-10-31 14:52:39 +03:00
parent 9bc64d73b3
commit 67ae7218af
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui (gen4)/features/collections.js
View File

@ -2217,6 +2217,7 @@ var AutoCollectionsActions = actions.Actions({
return local_tag_names.indexOf(tag) < 0 }) return local_tag_names.indexOf(tag) < 0 })
// XXX should this be a real tag query??? // XXX should this be a real tag query???
//var gids = this.data.getTaggedByAll(tags, true)
var gids = this.data.getTaggedByAll(tags) var gids = this.data.getTaggedByAll(tags)
// get items that topped matching the query... // get items that topped matching the query...
@ -2881,12 +2882,14 @@ var CollectionMarksActions = actions.Actions({
// marked... // marked...
collectMarked: ['- Collections|Mark/', collectMarked: ['- Collections|Mark/',
function(collection){ function(collection){
return this.collectTagged('selected', collection) }], return this.collect(this.marked, collection) }],
//return this.collectTagged('selected', collection) }],
uncollectMarked: ['Collections|Mark/Remove marked from collection', uncollectMarked: ['Collections|Mark/Remove marked from collection',
{browseMode: function(){ {browseMode: function(){
return (!this.collection || this.marked.length == 0) && 'disabled' }}, return (!this.collection || this.marked.length == 0) && 'disabled' }},
function(collection){ function(collection){
return this.uncollectTagged('selected', collection) }], return this.uncollect(this.marked, collection) }],
//return this.uncollectTagged('selected', collection) }],
// bookmarked... // bookmarked...
collectBookmarked: ['- Collections|Bookmark/', collectBookmarked: ['- Collections|Bookmark/',

14
ui (gen4)/imagegrid/data.js
View File

@ -3190,7 +3190,9 @@ var DataWithTagsPrototype = {
}, },
// selectors... // selectors...
getTaggedByAny: function(tags){ // NOTE: if raw is set to true then this will return all the tagged
// gids even if they are not loaded in ribbons (i.e. cropped out)...
getTaggedByAny: function(tags, raw){
tags = arguments.length > 1 ? [].slice.call(arguments) : tags tags = arguments.length > 1 ? [].slice.call(arguments) : tags
tags = tags instanceof Array ? tags : [tags] tags = tags instanceof Array ? tags : [tags]
@ -3208,9 +3210,11 @@ var DataWithTagsPrototype = {
} }
}) })
return res.compact() return raw ?
res.compact()
: this.getImages(res.compact())
}, },
getTaggedByAll: function(tags){ getTaggedByAll: function(tags, raw){
tags = arguments.length > 1 ? [].slice.call(arguments) : tags tags = arguments.length > 1 ? [].slice.call(arguments) : tags
tags = tags instanceof Array ? tags : [tags] tags = tags instanceof Array ? tags : [tags]
@ -3247,7 +3251,9 @@ var DataWithTagsPrototype = {
i = index.indexOf(l) i = index.indexOf(l)
} }
return res return raw ?
res
: this.getImages(res)
}, },
} }
DataWithTagsPrototype.__proto__ = DataPrototype DataWithTagsPrototype.__proto__ = DataPrototype