diff --git a/ui (gen4)/imagegrid/tags.js b/ui (gen4)/imagegrid/tags.js index 20af0fef..259328dc 100755 --- a/ui (gen4)/imagegrid/tags.js +++ b/ui (gen4)/imagegrid/tags.js @@ -2230,13 +2230,13 @@ var TagsWithHandlersPrototype = { // handler: action(tag, 'tag') tag: function(tags, value){ var that = this - return object.parent(TagsWithHandlersPrototype.tag, this).call(this, + return object.parentCall(TagsWithHandlersPrototype.tag, this, that.handleSpecialTag(tags, 'tag', value), ...[...arguments].slice(1)) }, // handler: action(tag, 'untag') untag: function(tags, value){ var that = this - return object.parent(TagsWithHandlersPrototype.untag, this).call(this, + return object.parentCall(TagsWithHandlersPrototype.untag, this, that.handleSpecialTag(tags, 'untag', value), ...[...arguments].slice(1)) }, // handler: action(tag, 'replace', from) @@ -2246,7 +2246,7 @@ var TagsWithHandlersPrototype = { to = tag tag = '*' } - return object.parent(TagsWithHandlersPrototype.replace, this).call(this, + return object.parentCall(TagsWithHandlersPrototype.replace, this, tag, arguments.length <= 2 ? (to instanceof Function ? @@ -2422,9 +2422,9 @@ var TagsWithDictPrototype = { // tag: function(tags, value){ this.normalizeSave(tags) - return object.parent(TagsWithDictPrototype.tag, this).call(this, ...arguments) }, + return object.parentCall(TagsWithDictPrototype.tag, this, ...arguments) }, untag: function(tags, value){ - var res = object.parent(TagsWithDictPrototype.untag, this).call(this, ...arguments) + var res = object.parentCall(TagsWithDictPrototype.untag, this, ...arguments) this.removeOrphansFromDict(tags) return res }, @@ -2436,7 +2436,7 @@ var TagsWithDictPrototype = { } var can_remove = [] - var res = object.parent(TagsWithDictPrototype.replace, this).call(this, + var res = object.parentCall(TagsWithDictPrototype.replace, this, tag, arguments.length == 2 ? (to instanceof Function ? @@ -2458,7 +2458,7 @@ var TagsWithDictPrototype = { togglePersistent: function(...tags){ this.normalizeSave(tags) - var res = object.parent(TagsWithDictPrototype.togglePersistent, this).call(this, ...arguments) + var res = object.parentCall(TagsWithDictPrototype.togglePersistent, this, ...arguments) this.removeOrphansFromDict(res .map(function(r, i){ @@ -2471,7 +2471,7 @@ var TagsWithDictPrototype = { && value != null && this.normalizeSave(tag, value) - var res = object.parent(TagsWithDictPrototype.define, this).call(this, ...arguments) + var res = object.parentCall(TagsWithDictPrototype.define, this, ...arguments) value == null && this.removeOrphansFromDict(tag) @@ -2490,7 +2490,7 @@ var TagsWithDictPrototype = { // ... // } json: function(){ - var res = object.parent(TagsWithDictPrototype.json, this).call(this, ...arguments) + var res = object.parentCall(TagsWithDictPrototype.json, this, ...arguments) // dict... this.dict @@ -2512,7 +2512,7 @@ var TagsWithDictPrototype = { .forEach(function(e){ that.dict[e[0]] = e[1].slice() }) - return object.parent(TagsWithDictPrototype.load, this).call(this, ...arguments) + return object.parentCall(TagsWithDictPrototype.load, this, ...arguments) }, } diff --git a/ui (gen4)/lib/keyboard.js b/ui (gen4)/lib/keyboard.js index 8e09f7fa..38cf88f6 100755 --- a/ui (gen4)/lib/keyboard.js +++ b/ui (gen4)/lib/keyboard.js @@ -1118,7 +1118,7 @@ var KeyboardWithCSSModesPrototype = { }, __init__: function(keyboard, context){ - object.parent(KeyboardWithCSSModesPrototype.__init__, this).call(this, keyboard) + object.parentCall(KeyboardWithCSSModesPrototype.__init__, this, keyboard) if(context instanceof Function){ Object.defineProperty(this, 'context', { diff --git a/ui (gen4)/lib/widget/browse2.html b/ui (gen4)/lib/widget/browse2.html index 5ac79583..14ce9a19 100755 --- a/ui (gen4)/lib/widget/browse2.html +++ b/ui (gen4)/lib/widget/browse2.html @@ -359,6 +359,7 @@ requirejs([ .focus() //$('.container').first().append(dialog.render()) + }) $(function(){ diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js index 5fb87656..74a4b333 100755 --- a/ui (gen4)/lib/widget/browse2.js +++ b/ui (gen4)/lib/widget/browse2.js @@ -4161,7 +4161,7 @@ var HTMLItemClassPrototype = { __proto__: BaseItem, text: function(elem){ - var txt = object.parent(HTMLItem.text, this).call(this, elem) + var txt = object.parentCall(HTMLItem.text, this, elem) return txt != null ? (txt + '') .replace(/\$(.)/g, '$1') @@ -4217,7 +4217,7 @@ var HTMLItemPrototype = { // maintain focus... update: function(){ var that = this - return object.parent(HTMLItemPrototype.update, this).call(this, ...arguments) + return object.parentCall(HTMLItemPrototype.update, this, ...arguments) .run(function(){ that.focused && that.elem.focus() }) }, @@ -4269,7 +4269,7 @@ var focusItem = function(direction){ return function(){ var name = direction == 'up' ? 'prev' : 'next' - object.parent(HTMLBrowserPrototype[name], name, this).call(this, ...arguments) + object.parentCall(HTMLBrowserPrototype, name, this, ...arguments) var threashold = this.options.focusOffsetWhileScrolling || 0 @@ -4916,7 +4916,7 @@ object.Constructor('HTMLRenderer', { }, // XXX is this needed with partial render??? __init__: function(root, options){ - var render = object.parent(HTMLRenderer.prototype.__init__, this).call(this, root, options) + var render = object.parentCall(HTMLRenderer.prototype.__init__, this, root, options) var browser = this.root @@ -5281,7 +5281,7 @@ var HTMLBrowserPrototype = { : pattern // call parent... - return object.parent(HTMLBrowserPrototype.search, this).call(this, pattern, ...args) }, + return object.parentCall(HTMLBrowserPrototype.search, this, pattern, ...args) }, // // Extended .get(..) to support: // - 'pagetop'/'pagebottom' + offset... @@ -5308,7 +5308,7 @@ var HTMLBrowserPrototype = { stop(func ? func.call(this, e, i, p) : e) }, ...args) - : object.parent(HTMLBrowserPrototype.get, this).call(this, pattern, func, ...args) }, + : object.parentCall(HTMLBrowserPrototype.get, this, pattern, func, ...args) }, // Copy/Paste support...