@@ -108,16 +108,11 @@ namespace GleanMetrics {
108108 */
109109 function constructClickEventContextForElement ( element : Element ) {
110110 const dataset = ( element as HTMLElement ) . dataset ;
111- const elementClickEventContext : ElementClickEventContext = { } ;
112- if ( dataset . gleanId ) {
113- elementClickEventContext . id = dataset . gleanId ;
114- }
115- if ( dataset . gleanType ) {
116- elementClickEventContext . type = dataset . gleanType ;
117- }
118- if ( dataset . gleanLabel ) {
119- elementClickEventContext . label = dataset . gleanLabel ;
120- }
111+ const elementClickEventContext : ElementClickEventContext = {
112+ ...( dataset . gleanId && { id : dataset . gleanId } ) ,
113+ ...( dataset . gleanType && { type : dataset . gleanType } ) ,
114+ ...( dataset . gleanLabel && { label : dataset . gleanLabel } )
115+ } ;
121116 return elementClickEventContext ;
122117 }
123118
@@ -131,14 +126,12 @@ namespace GleanMetrics {
131126 */
132127 export function handleClickEvent ( event : Event ) {
133128 const clickedElement = event . target as Element ;
134- console . log ( "clickedElement:" , clickedElement , "clickedElement.tagName:" , clickedElement . tagName ) ;
135129
136- const closestElementWithClickAttributes : Element | null = clickedElement . closest ( "[data-glean-id],[data-glean-type],[data-glean-label]" ) ;
130+ const closestElementWithClickAttributes : Element | null = clickedElement . closest ( "[data-glean-id], [data-glean-type], [data-glean-label]" ) ;
137131 if ( ! closestElementWithClickAttributes ) {
138132 console . log ( "Couldn't find closest element with click attributes for click event target:" , clickedElement ) ;
139133 return ;
140134 }
141- console . log ( "closestElementWithClickAttributes:" , closestElementWithClickAttributes , "closestElementWithClickAttributes.tagName:" , closestElementWithClickAttributes . tagName ) ;
142135
143136 const elementClickEventContext : ElementClickEventContext = constructClickEventContextForElement ( closestElementWithClickAttributes ) ;
144137 recordElementClick ( elementClickEventContext ) ;
0 commit comments