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

fixed several bugs...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2019-09-17 17:05:47 +03:00
parent 7d521bdf14
commit 78802f36da
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui (gen4)/lib/widget/browse2.js
View File

@ -2649,8 +2649,7 @@ var BaseBrowserPrototype = {
// an object... // an object...
// NOTE: this might get expensive as we call .search(..) per item... // NOTE: this might get expensive as we call .search(..) per item...
// XXX needs refactoring -- feels overcomplicated... // XXX needs refactoring -- feels overcomplicated...
var index = new Set(Object.values(this.index)) if(pattern instanceof BaseItem
if(index.has(pattern)
|| (pattern instanceof Array || (pattern instanceof Array
&& !pattern && !pattern
.reduce(function(r, e){ .reduce(function(r, e){
@ -2660,7 +2659,7 @@ var BaseBrowserPrototype = {
.reduce(function(res, e, i, p){ .reduce(function(res, e, i, p){
res.set(e, [i, p]) res.set(e, [i, p])
return res return res
}, new Map(), {iterateCollapsed: true}) }, new Map(), {iterateAll: true})
var res var res
var Stop = new Error('Stop iteration') var Stop = new Error('Stop iteration')
try { try {
@ -3047,12 +3046,6 @@ var BaseBrowserPrototype = {
// .focus('nested') // .focus('nested')
// .render({around: 'focused', count: 5}, browser.TextRenderer) // .render({around: 'focused', count: 5}, browser.TextRenderer)
// produce different results in terms of centering and alignment!!! // produce different results in terms of centering and alignment!!!
// XXX BUG: these falls int recursion...
// dialog.render({around: 9, count: 5}, browser.TextRenderer)
// dialog.render({around: 8, count: 3}, browser.TextRenderer)
// ...
// dialog.render({around: 7, count: 1}, browser.TextRenderer)
// dialog.render({from: 7}, browser.TextRenderer)
// XXX BUG: numbering is wrong when elements collapse... // XXX BUG: numbering is wrong when elements collapse...
// ...to fix this use .update() // ...to fix this use .update()
render: function(options, renderer){ render: function(options, renderer){
@ -3095,12 +3088,17 @@ var BaseBrowserPrototype = {
section[0] section[0]
: section : section
// from/to/around/count... // from/to/around/count...
var get_opts = Object.assign(
Object.create(options),
// prevent us from hitting inlined blocks as render start/end points...
{includeInlinedBlocks: false})
var get = function(x){ var get = function(x){
return options[x] instanceof BaseItem ? return options[x] instanceof BaseItem ?
[undefined, undefined, options[x]] [undefined, undefined, options[x]]
: options[x] != null ? : options[x] != null ?
that.get(options[x], function(e, i, p){ return [i, p, e] }, options) || [] that.get(options[x], function(e, i, p){ return [i, p, e] }, get_opts) || []
: [undefined, undefined, undefined] } : [undefined, undefined, undefined] }
var [f, from_path, from] = get('from') var [f, from_path, from] = get('from')
var [t, _, to] = get('to') var [t, _, to] = get('to')
@ -3116,7 +3114,7 @@ var BaseBrowserPrototype = {
: a != null ? : a != null ?
a - Math.floor(count/2) a - Math.floor(count/2)
: 0)), : 0)),
options) get_opts)
to = to to = to
|| this.get( || this.get(
(t = f != null ? (t = f != null ?
@ -3124,16 +3122,17 @@ var BaseBrowserPrototype = {
: a != null ? : a != null ?
a + Math.ceil(count/2) a + Math.ceil(count/2)
: -1), : -1),
options) } get_opts) }
[options.from, options.to] = [from, to] ;[options.from, options.to] = [from, to]
// partial render start path... // partial render start path...
// NOTE: used to check if an item is on the path to <from> and // NOTE: used to check if an item is on the path to <from> and
// pass it to the skipped topology constructor... // pass it to the skipped topology constructor...
from_path = options.from_path = from_path = options.from_path =
options.from_path options.from_path
|| from && this.pathOf(from, options) || from && this.pathOf(from, get_opts)
from_path = from_path instanceof Array && from_path from_path = from_path instanceof Array && from_path
// used as a means to calculate lengths of nested blocks rendered // used as a means to calculate lengths of nested blocks rendered
// via .render(..) // via .render(..)
var l var l