diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js index 1a3b4dab..2ea98090 100755 --- a/ui (gen4)/lib/widget/browse2.js +++ b/ui (gen4)/lib/widget/browse2.js @@ -3008,7 +3008,7 @@ var BaseBrowserPrototype = { // do not reconstruct the ones already present... // XXX should from/to/around/count be a feature of this or of .walk(..)??? // XXX might be a good idea to use this.root === this instead of context.root === this - //* + /* render: function(options, renderer, context){ renderer = renderer || this context = renderer.renderContext(context) @@ -3187,7 +3187,7 @@ var BaseBrowserPrototype = { // - from/to/around/count support... // - ability to render separate items/sub-trees or lists of items... // ...pass the list to .walk(..), i.e. .walk(list/query, ...) - // XXX revise how options are passed down the inlined/nested browsers... + // XXX revise options handling... // XXX doc... render: function(options, renderer){ var that = this @@ -3207,13 +3207,16 @@ var BaseBrowserPrototype = { args.pop() : 0 + // XXX revise... options = Object.assign( - Object.create(this.options || {}), - { - iterateNonIterable: true, - includeInlinedBlocks: true, - }, - options || {}) + Object.create(this.options || {}), + { + iterateNonIterable: true, + includeInlinedBlocks: true, + }, + // NOTE: we need to get all the keys from options, including + // inherited defaults... + Object.flatCopy(options || {})) var render = renderer || this.__renderer__ render = render.root == null ? @@ -4131,11 +4134,9 @@ var updateElemClass = function(action, cls, handler){ // Renderer... // XXX needs testing... -// - structure seems to be fine... -// - rename .render(..) -> .render(..) and do a full test... +// - partial rendering... +// - local re-rendering... // - problems: -// - inlined/nested dialogs do not get button config... -// ...options not passed down correctly? // - re-rendering loses focus... // XXX doc... var HTMLRenderer =