From e03749131c8c3dbcd0467c8523d174eb3a920c5f Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sat, 9 Feb 2019 02:20:31 +0300 Subject: [PATCH] cleanup and tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/lib/widget/browse2.html | 2 +- ui (gen4)/lib/widget/browse2.js | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ui (gen4)/lib/widget/browse2.html b/ui (gen4)/lib/widget/browse2.html index 43db0572..2e59ff4e 100755 --- a/ui (gen4)/lib/widget/browse2.html +++ b/ui (gen4)/lib/widget/browse2.html @@ -141,7 +141,7 @@ requirejs([ }) }) - dialog_1.__root = $('.container').first()[0] + dialog_1.parent = $('.container').first()[0] dialog_1.render() diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js index 6d269796..1f427be8 100755 --- a/ui (gen4)/lib/widget/browse2.js +++ b/ui (gen4)/lib/widget/browse2.js @@ -405,7 +405,7 @@ var BaseBrowserPrototype = { update: function(options){ return this .make(options) - .render(this, options) }, + .render(options) }, // XXX item API... @@ -459,13 +459,26 @@ var BrowserPrototype = { renderHidden: false, }, - + + + get parent(){ + return this.__parent }, + set parent(value){ + var dom = this.dom + this.__parent = value + // transfer the dom to the new parent... + dom && (this.dom = dom) + }, + get dom(){ - return this.__root }, + return this.parent ? + this.parent.querySelector('.browse-widget') + : this.__dom }, set dom(value){ - this.__root ? - this.__root.replaceWith(value) - : (this.__root = value)}, + this.parent ? + $(this.parent).empty().append($(value)) + : (this.__dom = value) }, + // XXX instrument interactions... renderList: function(items, options){