1
0
Fork 0

[DEV-7060] Remove key sizzle calls from ElementStyler

Mark Goldsmith 2020-02-13 16:54:44 -05:00 committed by Goldsmith, Mark
parent 200ae99ce5
commit b624fa55ff
1 changed files with 49 additions and 34 deletions

View File

@ -20,7 +20,7 @@
* *
* @needsLove * @needsLove
* - Everything! This class exists from when the framework was barely * - Everything! This class exists from when the framework was barely
* more than a few prototypes and has rotted ever since with little else * more than a few prototypes and has rotted ever since with little else
* but workarounds. * but workarounds.
* @end needsLove * @end needsLove
*/ */
@ -82,6 +82,12 @@ module.exports = Class( 'ElementStyler',
*/ */
'private _$context': null, 'private _$context': null,
/**
* jQuery Object
* @type {jQuery}
*/
'private _jquery': null,
_answerStyles: { _answerStyles: {
'deductible': function( value, _, default_val ) 'deductible': function( value, _, default_val )
@ -186,6 +192,7 @@ module.exports = Class( 'ElementStyler',
__construct: function( jquery ) __construct: function( jquery )
{ {
this._$context = jquery; this._$context = jquery;
this._jquery = jquery;
}, },
@ -802,28 +809,34 @@ module.exports = Class( 'ElementStyler',
* *
* This allows for a simple mapping from bucket to UI. * This allows for a simple mapping from bucket to UI.
* *
* @param {string} name element name (question name) * @param {string} name element name (question name)
* @param {number=} index index of element to retrieve (bucket index) * @param {number=} index index of element to retrieve (bucket index)
* @param {string=} filter filter to apply to widgets * @param {string=} filter filter to apply to widgets
* @param {jQuery=} $context filtering context * @param {HTMLElement} $context filtering context
* *
* @return {jQuery} matches * @return {jQuery} matches
*/ */
'public getWidgetByName': function( name, index, filter, $context ) 'public getWidgetByName': function( name, index, filter, context )
{ {
$context = $context || this._$context; context = context || this._$context;
// Todo: Transitional step to remove jQuery
if ( context instanceof jQuery )
{
context = context[ 0 ];
}
// find the field; note that we *skip* the index selection if we have // find the field; note that we *skip* the index selection if we have
// been notified---via a property on the context---that the content // been notified---via a property on the context---that the content
// should contain only the index we are looking for // should contain only the index we are looking for
var $results = this._getWidgetByNameQuick( name, index, $context ); var results = this._getWidgetByNameQuick( name, index, context );
if ( filter ) if ( filter )
{ {
return $results.filter( filter ); throw new Error( "Filter deprecated" );
} }
return $results; return this._jquery( results );
}, },
@ -835,33 +848,31 @@ module.exports = Class( 'ElementStyler',
* performed the check to begin with, so the idea is to find the id for as * performed the check to begin with, so the idea is to find the id for as
* many as possible. * many as possible.
*/ */
'private _getWidgetByNameQuick': function( name, index, $context ) 'private _getWidgetByNameQuick': function( name, index, context )
{ {
var hasindex = ( ( index !== undefined ) && !$context.singleIndex ); var hasindex = ( ( index !== undefined ) && !context.singleIndex );
if ( hasindex ) if ( hasindex )
{ {
var id = this._getElementId( name, index, $context ); var id = this._getElementId( name, index );
if ( id ) if ( id )
{ {
$element = $context.find( '#' + id ); element = document.getElementById( id );
// let's hope for the best // let's hope for the best
if ( $element.length ) if ( element !== null )
{ {
return $element; return element;
} }
} }
// Fallback to the painfully slow method.
return context.querySelectorAll( '[data-field-name="' + name + '"]' )[ index ];
} }
// damnit. Fallback to the painfully slow method. // If no index, return first element
return $context.find( '[data-field-name="' + name + '"]' + return context.querySelector( '[data-field-name="' + name + '"]' );
( ( hasindex )
? ':nth(' + +index + ')'
: ''
)
);
}, },
@ -922,28 +933,32 @@ module.exports = Class( 'ElementStyler',
* using NAME as an element id; otherwise, this acts just as * using NAME as an element id; otherwise, this acts just as
* getElementByName. * getElementByName.
* *
* @param {string} name element name (question name) * @param {string} name element name (question name)
* @param {number=} index index of element to retrieve (bucket index) * @param {number=} index index of element to retrieve (bucket index)
* @param {string=} filter filter to apply to widgets * @param {string=} filter filter to apply to widgets
* @param {jQuery=} $context filtering context * @param {HTMLElement} context filtering context
* *
* @return {jQuery} matches * @return {jQuery} matches
*/ */
'public getElementByNameLax': function( 'public getElementByNameLax': function(
name, index, filter, $context name, index, filter, context
) )
{ {
$context = $context || this._$context; context = context || this._$context;
// Todo: Transitional step to remove jQuery
if ( context instanceof jQuery )
{
context = context[ 0 ];
}
if ( !( this.isAField( name ) ) ) if ( !( this.isAField( name ) ) )
{ {
return $context.find( return this._jquery( context.querySelectorAll( '#' + name )[ index ] );
'#' + name + ':nth(' + index + ')'
);
} }
return this.getElementByName( return this.getElementByName(
name, index, filter, $context name, index, filter, context
); );
}, },
@ -1030,7 +1045,7 @@ module.exports = Class( 'ElementStyler',
}, },
'private _getElementId': function( name, index, $context ) 'private _getElementId': function( name, index )
{ {
switch ( this._getElementType( name ) ) switch ( this._getElementType( name ) )
{ {