flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20: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-12-27 00:43:23 +03:00
parent 3e6453253c
commit ffd5e3b4c1
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1971,7 +1971,7 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
function(title){ function(title){
var that = this var that = this
var local_tag_names = this.config['collection-local-tags'] || [] var local_tag_names = this.config['collection-local-tags'] || []
var tags = this.data.tags.__index var tags = this.data.tags
// NOTE: this is done at the .pre stage as we need to grab // NOTE: this is done at the .pre stage as we need to grab
// the tags BEFORE the data gets cleared (in the case // the tags BEFORE the data gets cleared (in the case
@ -1982,14 +1982,16 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
// load local_tags... // load local_tags...
local_tag_names local_tag_names
.forEach(function(tag){ .forEach(function(tag){
tags[tag] = new Set(local_tags[tag] // XXX this is not correct as we can have mixed tags...
// ...use actual tag API...
tags.__index[tag] = new Set(local_tags[tag]
|| (that.data.tags.__index || {})[tag] || (that.data.tags.__index || {})[tag]
|| []) || [])
}) })
;(this.crop_stack || []) ;(this.crop_stack || [])
.forEach(function(d){ d.tags.__index = tags }) .forEach(function(d){ d.tags = tags })
this.data.tags.__index = tags this.data.tags = tags
} }
}], }],
// remove tags from unloaded collections... // remove tags from unloaded collections...
@ -2021,6 +2023,8 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
local_tag_names local_tag_names
.forEach(function(tag){ .forEach(function(tag){
local_tags[tag] = (!new_set || title == MAIN_COLLECTION_TITLE) ? local_tags[tag] = (!new_set || title == MAIN_COLLECTION_TITLE) ?
// XXX this is not correct as we can have mixed tags...
// ...use actual tag API...
((that.data.tags.__index || {})[tag] || new Set()) ((that.data.tags.__index || {})[tag] || new Set())
: new Set() : new Set()
}) })
@ -2038,14 +2042,20 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
gids = gids instanceof Array ? gids : [gids] gids = gids instanceof Array ? gids : [gids]
// prevent global tag removal... // prevent global tag removal...
var tags = this.data.tags.__index var tags = this.data.tags
// XXX do we need this??? (leftover from prev tak implementation) // XXX do we need this??? (leftover from prev tak implementation)
//delete this.data.tags //delete this.data.tags
return function(){ return function(){
tags.untag(local_tag_names, gids)
// update local tags... // update local tags...
/*
local_tag_names.forEach(function(tag){ local_tag_names.forEach(function(tag){
tags[tag] = tags[tag].subtract(gids) }) // XXX this is not correct as we can have mixed tags...
// ...use actual tag API...
tags[tag] = tags[tag].subtract(gids)
})
//*/
//this.data.tags.__index = tags //this.data.tags.__index = tags
} }
@ -2886,13 +2896,11 @@ var CollectionMarksActions = actions.Actions({
collectMarked: ['- Collections|Mark/', collectMarked: ['- Collections|Mark/',
function(collection){ function(collection){
return this.collect(this.marked, collection) }], return this.collect(this.marked, collection) }],
//return this.collectTagged('marked', 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.uncollect(this.marked, collection) }], return this.uncollect(this.marked, collection) }],
//return this.uncollectTagged('marked', collection) }],
// bookmarked... // bookmarked...
collectBookmarked: ['- Collections|Bookmark/', collectBookmarked: ['- Collections|Bookmark/',