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

cleanup and refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2019-09-18 18:03:46 +03:00
parent 36df133917
commit ffb5cfb59e
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3030,19 +3030,21 @@ var BaseBrowserPrototype = {
// topology, doing this via .render(..) directly will maintain // topology, doing this via .render(..) directly will maintain
// topology but will break control and other data-driven stuff... // topology but will break control and other data-driven stuff...
// //
// // XXX revise...
// XXX revise options handling...
// 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){
var that = this var that = this
var args = [...arguments] var args = [...arguments]
// item list... // parse args...
var list = (args[0] instanceof BaseItem || args[0] instanceof Array) ? var list = (args[0] instanceof BaseItem || args[0] instanceof Array) ?
[args.shift()].flat() [args.shift()].flat()
: null : null
var [options, renderer] =
(args[0] instanceof BaseRenderer || args[0] instanceof Function) ?
[null, args.shift()]
: args
// NOTE: these only apply to the 'items' section... // NOTE: these only apply to the 'items' section...
var base_path = args[args.length-1] instanceof Array ? var base_path = args[args.length-1] instanceof Array ?
args.pop() args.pop()
@ -3051,7 +3053,6 @@ var BaseBrowserPrototype = {
args.pop() args.pop()
: 0 : 0
var [options, renderer] = args
options = Object.assign( options = Object.assign(
Object.create(this.options || {}), Object.create(this.options || {}),
{ {
@ -3158,6 +3159,20 @@ var BaseBrowserPrototype = {
: this.walk( : this.walk(
...(list || []), ...(list || []),
function(e, i, p, children){ function(e, i, p, children){
// maintain rendering state....
// NOTE: render ranges are supported only in 'items' section...
rendering = section != 'items'
|| (render.rendering =
!rendering && from === e ?
true
: rendering && to === e ?
null
: render.rendering)
// XXX should we stop here?
// ...we'll need stop() to return the incomplete list...
//rendering === null
// && stop()
// index... // index...
// NOTE: since we let the nested browsers render sections // NOTE: since we let the nested browsers render sections
// of the list, we also need to compensate for the // of the list, we also need to compensate for the
@ -3168,7 +3183,6 @@ var BaseBrowserPrototype = {
// path... // path...
// remove inlined item id from path... // remove inlined item id from path...
// NOTE: render.inline(..) can add this back if needed...
;(e instanceof BaseBrowser || e instanceof Array) ;(e instanceof BaseBrowser || e instanceof Array)
&& p.pop() && p.pop()
p = base_path.concat(p) p = base_path.concat(p)
@ -3191,23 +3205,9 @@ var BaseBrowserPrototype = {
.render(options, render, i+1, p)) .render(options, render, i+1, p))
: children(true) } : children(true) }
// maintain rendering state....
// NOTE: render ranges are supported only in 'items' section...
rendering = section != 'items'
|| (render.rendering =
!rendering && from === e ?
true
: rendering && to === e ?
null
: render.rendering)
// XXX should we stop here?
// ...we'll need stop() to return the incomplete list...
//rendering === null
// && stop()
// do the actual rendering... // do the actual rendering...
return ( return (
// special case: nested <from> elem -> render topology only... // special case: nested from -> render topology...
(from_path (from_path
&& rendering === false && rendering === false
// only for nested... // only for nested...