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

fixes and tweaks...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-09-02 21:15:57 +03:00
parent c825cb050c
commit 463eb0918a
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,15 +598,16 @@ var CollectionActions = actions.Actions({
} }
Object.keys(c).forEach(function(title){ Object.keys(c).forEach(function(title){
var state = collections[title] = { title: title }
// load data... // load data...
var d = c[title].data instanceof data.Data ? var d = c[title].data == null ?
c[title].data null
: c[title].data instanceof data.Data ?
c[title].data
: data.Data.fromJSON(c[title].data) : data.Data.fromJSON(c[title].data)
if(d){
var state = collections[title] = { state.data = d
title: title,
data: d,
} }
// NOTE: this can be done lazily when loading each collection // NOTE: this can be done lazily when loading each collection
@ -691,11 +692,10 @@ var CollectionActions = actions.Actions({
var data = ((mode == 'base' && state.crop_stack) ? var data = ((mode == 'base' && state.crop_stack) ?
(state.crop_stack[0] || state.data) (state.crop_stack[0] || state.data)
: state.data) : state.data)
.dumpJSON()
var s = res.collections[title] = { var s = res.collections[title] = { title: title }
title: title, if(data){
data: data, s.data = data.dumpJSON()
} }
// handle .crop_stack of collection... // handle .crop_stack of collection...
@ -997,7 +997,7 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
rc rc
&& Object.keys(rc || {}) && Object.keys(rc || {})
.forEach(function(title){ .forEach(function(title){
var tags = c[title].local_tags var tags = c[title].local_tags || {}
var rtags = rc[title].local_tags = {} var rtags = rc[title].local_tags = {}
// compact the local tags... // compact the local tags...
@ -1007,7 +1007,9 @@ module.CollectionTags = core.ImageGridFeatures.Feature({
// no need to save the tags in more than the // no need to save the tags in more than the
// root .data... // root .data...
delete rc[title].data.tags if(rc[title].data){
delete rc[title].data.tags
}
}) })
}], }],
], ],
@ -1066,6 +1068,22 @@ module.AutoTagCollections = core.ImageGridFeatures.Feature({
], ],
actions: AutoTagCollectionsActions, actions: AutoTagCollectionsActions,
handlers: [
['json',
function(res){
var c = this.collections || {}
var rc = res.collections || {}
Object.keys(rc)
.forEach(function(title){
var q = c[title].tag_query
if(q){
rc[title].tag_query = q
}
})
}],
],
}) })