flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-28 18:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

seem to have ironed out most of the issues, still in testing mode...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-12-06 02:44:46 +03:00
parent 3eecbd6484
commit 0a8af5628a
3 changed files with 14 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

@ -1982,7 +1982,9 @@ 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] || []) tags[tag] = new Set(local_tags[tag]
|| (that.data.tags.__index || {})[tag]
|| [])
}) })
;(this.crop_stack || []) ;(this.crop_stack || [])
@ -2109,13 +2111,14 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
} }
var t = (c.data || {}).tags || {} var t = (c.data || {}).tags || {}
/* XXX do we need this???
c.local_tags = c.local_tags || {} c.local_tags = c.local_tags || {}
;(that.config['collection-local-tags'] || []) ;(that.config['collection-local-tags'] || [])
.forEach(function(tag){ .forEach(function(tag){
c.local_tags[tag] = new Set(c.local_tags[tag] || t[tag] || []) }) c.local_tags[tag] = new Set(c.local_tags[tag] || t[tag] || []) })
//*/
}) })
}], }],
//*/
], ],
}) })

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

@ -3399,6 +3399,8 @@ var DataWithTags2Prototype = {
}, },
join: function(...others){ join: function(...others){
var res = DataWithTags2Prototype.__proto__.join.apply(this, arguments) var res = DataWithTags2Prototype.__proto__.join.apply(this, arguments)
!(others[0] instanceof Data)
&& others.shift()
res.tags.join(...others res.tags.join(...others
.map(function(other){ .map(function(other){
return other.tags })) return other.tags }))

11
ui (gen4)/imagegrid/tags.js
View File

@ -445,7 +445,7 @@ var TagsPrototype = {
return false return false
}, },
has: function(value){ has: function(value){
for(var v of Object.values(this.__index)){ for(var v of Object.values(this.__index || {})){
if(v.has(value)){ if(v.has(value)){
return true return true
} }
@ -754,19 +754,22 @@ var TagsPrototype = {
join: function(...others){ join: function(...others){
var that = this var that = this
var index = this.__index var index = this.__index || {}
others others
.forEach(function(other){ .forEach(function(other){
Object.entries(other.__index) Object.entries(other.__index || {})
.forEach(function(e){ .forEach(function(e){
index[e[0]] = new Set([...(index[e[0]] || []), ...e[1]]) }) }) index[e[0]] = new Set([...(index[e[0]] || []), ...e[1]]) }) })
Object.keys(index).length > 0
&& this.__index == null
&& (this.__index = index)
return this return this
}, },
// XXX create a new tagset with only the given values... // XXX create a new tagset with only the given values...
// XXX this should support a function... // XXX this should support a function...
filter: function(values){ filter: function(values){
var res = this.clone() var res = this.clone()
Object.values(res.__index) Object.values(res.__index || {})
.forEach(function(s){ .forEach(function(s){
values.forEach(function(v){ s.delete(v) }) }) values.forEach(function(v){ s.delete(v) }) })
return res return res