Client: Eliminate old event handling system
All of the old events have been removed! * src/client/Client.js (handleEvent): Remove remainder of old system (after last commit, all that was left was error handling). Correct docblock.master
parent
58533f6d72
commit
cc7370711d
|
@ -2561,14 +2561,12 @@ module.exports = Class( 'Client' )
|
||||||
/**
|
/**
|
||||||
* Handles client-side events
|
* Handles client-side events
|
||||||
*
|
*
|
||||||
* @param String event_name name of the event
|
* @param {string} event_name name of the event
|
||||||
* @param Object data data to pass to event
|
* @param {Object} data data to pass to event
|
||||||
* @param Function callback function to call when event is done (if
|
* @param {function(Object)} callback function to call when event is done
|
||||||
* not asynchronous, it'll be called immediately)
|
* @param {function(Error)} error_callback function to call if event fails
|
||||||
*
|
*
|
||||||
* @param Function error_callback function to call if event fails
|
* @return {Client} self to allow for method chaining
|
||||||
*
|
|
||||||
* @return Client self to allow for method chaining
|
|
||||||
*/
|
*/
|
||||||
handleEvent: function( event_name, data, callback, error_callback )
|
handleEvent: function( event_name, data, callback, error_callback )
|
||||||
{
|
{
|
||||||
|
@ -2577,14 +2575,12 @@ module.exports = Class( 'Client' )
|
||||||
|
|
||||||
this.emit( this.__self.$('EVENT_TRIGGER'), event_name, data );
|
this.emit( this.__self.$('EVENT_TRIGGER'), event_name, data );
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
this._eventHandler.handle(
|
this._eventHandler.handle(
|
||||||
event_name, function( err, data )
|
event_name, function( err, data )
|
||||||
{
|
{
|
||||||
if ( err )
|
if ( err )
|
||||||
{
|
{
|
||||||
error_callback( err );
|
error_callback && error_callback( err );
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2598,87 +2594,7 @@ module.exports = Class( 'Client' )
|
||||||
}, data
|
}, data
|
||||||
);
|
);
|
||||||
|
|
||||||
// we had no problem handling this event; no need to continue with
|
|
||||||
// the old event handling system
|
|
||||||
return this;
|
return this;
|
||||||
}
|
|
||||||
catch ( e )
|
|
||||||
{
|
|
||||||
// segue into the old event handling system
|
|
||||||
if ( !( Class.isA( UnknownEventError, e ) ) )
|
|
||||||
{
|
|
||||||
// ruh roh
|
|
||||||
this._handleError( e );
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this._handleError( Error(
|
|
||||||
'Unknown client-side event: ' + event_name
|
|
||||||
) );
|
|
||||||
|
|
||||||
// call the callback, if one was provided
|
|
||||||
if ( callback instanceof Function )
|
|
||||||
{
|
|
||||||
callback.call( this );
|
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Trigger DataApi event for field FIELD
|
|
||||||
*
|
|
||||||
* @param {string} field field name
|
|
||||||
*
|
|
||||||
* @return {undefined}
|
|
||||||
*/
|
|
||||||
'private _dapiTrigger': function( field )
|
|
||||||
{
|
|
||||||
var _self = this;
|
|
||||||
|
|
||||||
this.getQuote().visitData( function( bucket )
|
|
||||||
{
|
|
||||||
_self.program.dapi(
|
|
||||||
_self._currentStepId,
|
|
||||||
field,
|
|
||||||
bucket,
|
|
||||||
{},
|
|
||||||
_self._cmatch,
|
|
||||||
null
|
|
||||||
);
|
|
||||||
} );
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
'private _resetFields': function( fields )
|
|
||||||
{
|
|
||||||
var update = {};
|
|
||||||
|
|
||||||
for ( var field in fields )
|
|
||||||
{
|
|
||||||
var cur = fields[ field ],
|
|
||||||
cdata = this._quote.getDataByName( field ),
|
|
||||||
val = this.elementStyler.getDefault( field );
|
|
||||||
|
|
||||||
var data = [];
|
|
||||||
for ( var i in cur )
|
|
||||||
{
|
|
||||||
var index = cur[ i ];
|
|
||||||
|
|
||||||
if ( cdata[ index ] === val )
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
data[ index ] = val;
|
|
||||||
}
|
|
||||||
|
|
||||||
update[ field ] = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._quote.setData( update );
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue