cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2019-06-15 18:49:41 +03:00
parent 538216cfb9
commit 3624e63743

View File

@ -328,7 +328,7 @@ function(item, event, evt, ...args){
// Generate item event method... // Generate item event method...
// //
// makeItemEventMethod(event_name) // makeItemEventMethod(event_name)
// makeItemEventMethod(event_name, {handler, default_getter, filter, options, get_mode}) // makeItemEventMethod(event_name, {handler, default_getter, filter, options, getter})
// -> event_method // -> event_method
// //
// //
@ -370,10 +370,10 @@ function(item, event, evt, ...args){
// NOTE: item events do not directly trigger the original caller's handlers // NOTE: item events do not directly trigger the original caller's handlers
// those will get celled recursively when the events are propagated // those will get celled recursively when the events are propagated
// up the tree. // up the tree.
// XXX destructuring: move the defaults to the arguments... // XXX destructuring: should default_item get .focused???
var makeItemEventMethod = var makeItemEventMethod =
module.makeItemEventMethod = module.makeItemEventMethod =
function(event, {handler, action, default_item, filter, options, get_mode}={}){ function(event, {handler, action, default_item, filter, options={}, getter='search'}={}){
var filterItems = function(items){ var filterItems = function(items){
items = items instanceof Array ? items = items instanceof Array ?
items items
@ -383,14 +383,12 @@ function(event, {handler, action, default_item, filter, options, get_mode}={}){
return filter ? return filter ?
items.filter(filter) items.filter(filter)
: items } : items }
//options = args.shift()
options = Object.assign( options = Object.assign(
// NOTE: we need to be able to pass item objects, so we can not // NOTE: we need to be able to pass item objects, so we can not
// use queries at the same time as there is not way to // use queries at the same time as there is not way to
// distinguish one from the other... // distinguish one from the other...
{ noQueryCheck: true }, { noQueryCheck: true },
options || {}) options)
var getter = get_mode || 'search'
// base event method... // base event method...
// NOTE: this is not returned directly as we need to query the items // NOTE: this is not returned directly as we need to query the items
// and pass those on to the handlers rather than the arguments // and pass those on to the handlers rather than the arguments
@ -438,7 +436,6 @@ function(event, {handler, action, default_item, filter, options, get_mode}={}){
// Make event method edit item... // Make event method edit item...
// //
// XXX should this .update() // XXX should this .update()
// XXX destructuring: move the defaults to the arguments...
var makeItemOptionEventMethod = var makeItemOptionEventMethod =
module.makeItemOptionEventMethod = module.makeItemOptionEventMethod =
function(event, action, {handler, default_item, filter, options, update=true}={}){ function(event, action, {handler, default_item, filter, options, update=true}={}){
@ -462,7 +459,6 @@ function(event, action, {handler, default_item, filter, options, update=true}={}
// Make event method to toggle item attr on/off... // Make event method to toggle item attr on/off...
// //
// XXX destructuring: move the defaults to the arguments...
var makeItemOptionOnEventMethod = var makeItemOptionOnEventMethod =
module.makeItemOptionOnEventMethod = module.makeItemOptionOnEventMethod =
function(event, attr, {handler, default_item, filter, options, update=true}={}){ function(event, attr, {handler, default_item, filter, options, update=true}={}){
@ -2648,7 +2644,7 @@ var BaseBrowserPrototype = {
&& (item.focused = true) }, && (item.focused = true) },
default_item: function(){ return this.get(0) }, default_item: function(){ return this.get(0) },
options: { options: {
get_mode: 'get', getter: 'get',
skipDisabled: true, skipDisabled: true,
} }), } }),
blur: makeItemEventMethod('blur', { blur: makeItemEventMethod('blur', {