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

several fixes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2017-12-13 17:14:58 +03:00
parent f80c5143ac
commit 3465334e7a
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui (gen4)/features/base.js
View File

@ -727,7 +727,7 @@ core.ImageGridFeatures.Feature({
}
// data...
if(changes === true || changes.data){
if((changes === true || changes.data) && res.raw.data){
res.index.data = res.raw.data
}
@ -1364,7 +1364,7 @@ module.TagsEdit = core.ImageGridFeatures.Feature({
function(res){
var changes = res.changes
if(!changes){
if(!changes || !res.raw.data){
return
}

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

@ -1483,7 +1483,12 @@ module.Collection = core.ImageGridFeatures.Feature({
// NOTE: we are placing this in the index root to
// simplify lazy-loading of the collection
// index...
if(changes && (changes === true || changes.collections)){
// NOTE: if there are no collections defined this section
// is skipped...
if(collections
&& changes
&& (changes === true
|| changes.collections)){
//var index = res.index['collection-index'] = {}
var index = res.index['collections'] = {}
// NOTE: we do not need to use .collection_order here
@ -1491,10 +1496,17 @@ module.Collection = core.ImageGridFeatures.Feature({
// correct order...
Object.keys(res.raw.collections || {})
.forEach(function(title){
var m = index[collections[title].gid || title] = { title: title }
if(title in collections){
var gid = (collections[title] || {}).gid || title
var m = index[gid] = { title: title }
if(res.raw.collections[title].count){
m['count'] = res.raw.collections[title].count
if(res.raw.collections[title].count){
m['count'] = res.raw.collections[title].count
}
// empty / default collections (placeholders)...
} else {
index[title] = false
}
})
}
@ -1542,6 +1554,7 @@ module.Collection = core.ImageGridFeatures.Feature({
// move the collection data to collection path...
Object.keys(prepared)
.filter(function(key){ return key != 'collections' })
.forEach(function(key){
res.index[path +'/'+ key] = prepared[key]
delete metadata[key]
@ -1564,8 +1577,22 @@ module.Collection = core.ImageGridFeatures.Feature({
var collections_index = {}
var index = json['collections']
index
&& Object.keys(index).forEach(function(gid){
if(index){
// get collection order...
var order = Object.keys(index)
.map(function(k){
return index[k] ? index[k].gid || index[k].title || k : k })
if(order.length > 0){
res.collection_order = order
}
// collection data...
Object.keys(index).forEach(function(gid){
if(index[gid] === false){
return
}
//var title = index[gid]
var title = index[gid].title || index[gid]
var path = 'collections/'+ gid
@ -1582,6 +1609,7 @@ module.Collection = core.ImageGridFeatures.Feature({
m.count = index[gid].count
}
})
}
if(Object.keys(collections).length > 0){
res.collections = collections

3
ui (gen4)/features/sort.js
View File

@ -545,6 +545,9 @@ module.Sort = core.ImageGridFeatures.Feature({
;['sort_order', 'sort_cache']
.forEach(function(attr){
if(!res.raw.data){
return
}
if((c === true || c[attr]) && res.raw.data[attr]){
// full save...
if(c === true){