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 2017-12-29 23:06:55 +03:00
parent bead309555
commit c2bccd8ae8
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui (gen4)/features/meta.js
View File

@ -105,6 +105,8 @@ core.ImageGridFeatures.Feature('imagegrid-testing', [
'imagegrid-commandline', 'imagegrid-commandline',
'imagegrid-ui', 'imagegrid-ui',
//'-ui-partial-ribbons',
// read-only mode... // read-only mode...
// XXX at this point this needs some more tuneup, the following // XXX at this point this needs some more tuneup, the following

5
ui (gen4)/features/ui-ribbons.js
View File

@ -610,9 +610,10 @@ actions.Actions({
? this.ribbons.elemGID(target) ? this.ribbons.elemGID(target)
// NOTE: data.getImage(..) can return null at start or end // NOTE: data.getImage(..) can return null at start or end
// of ribbon, thus we need to account for this... // of ribbon, thus we need to account for this...
: (this.data.getImage(target) : (this.data.getImage(target, 'before')
|| this.data.getImage(target, 'after')) || this.data.getImage(target, 'after'))
w = w || this.screenwidth w = w || this.screenwidth
// get config data and normalize... // get config data and normalize...
@ -712,7 +713,7 @@ core.ImageGridFeatures.Feature({
// NOTE: we have to do this as we are called BEFORE the // NOTE: we have to do this as we are called BEFORE the
// actual focus change happens... // actual focus change happens...
// XXX is there a better way to do this??? // XXX is there a better way to do this???
target = list != null ? target = this.data.getImage(target, list) : target target = list != null ? this.data.getImage(target, list) : target
this.updateRibbon(target) this.updateRibbon(target)
}], }],

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

@ -892,7 +892,12 @@ var DataPrototype = {
offset = -1 offset = -1
} else { } else {
var offset = 0 var offset = 0
mode = mode == null ? 'before' : mode // NOTE: this will set the default mode to 'before' but only
// when we are looking withing a specific set of images
// ...otherwise it will be left as is, i.e. strict mode.
mode = (mode == null && list != null) ?
'before'
: mode
} }
// normalize the list to a sparse list of gids... // normalize the list to a sparse list of gids...
@ -1105,7 +1110,7 @@ var DataPrototype = {
this.makeSparseImages(ribbons[k], res) this.makeSparseImages(ribbons[k], res)
} }
list = res.compact() list = res.compact()
target = null target = null
// filter out the unloaded gids from given list... // filter out the unloaded gids from given list...
} else if(target != null && target instanceof Array){ } else if(target != null && target instanceof Array){