@@ -279,28 +279,28 @@ export class Reactivity {
279279 _subscribeEffect ( effect ) {
280280 var reactivity = this ;
281281
282- for ( var [ depKey , dependency ] of effect . dependencies ) {
283- if ( dependency . type === "symbol" && dependency . scope === "global" ) {
284- if ( ! globalSubscriptions . has ( dependency . name ) ) {
285- globalSubscriptions . set ( dependency . name , new Set ( ) ) ;
282+ for ( var [ depKey , dep ] of effect . dependencies ) {
283+ if ( dep . type === "symbol" && dep . scope === "global" ) {
284+ if ( ! globalSubscriptions . has ( dep . name ) ) {
285+ globalSubscriptions . set ( dep . name , new Set ( ) ) ;
286286 }
287- globalSubscriptions . get ( dependency . name ) . add ( effect ) ;
287+ globalSubscriptions . get ( dep . name ) . add ( effect ) ;
288288
289- } else if ( dependency . type === "symbol" && dependency . scope === "element" ) {
290- var state = getElementState ( dependency . element ) ;
289+ } else if ( dep . type === "symbol" && dep . scope === "element" ) {
290+ var state = getElementState ( dep . element ) ;
291291 if ( ! state . subscriptions ) {
292292 state . subscriptions = new Map ( ) ;
293293 }
294- if ( ! state . subscriptions . has ( dependency . name ) ) {
295- state . subscriptions . set ( dependency . name , new Set ( ) ) ;
294+ if ( ! state . subscriptions . has ( dep . name ) ) {
295+ state . subscriptions . set ( dep . name , new Set ( ) ) ;
296296 }
297- state . subscriptions . get ( dependency . name ) . add ( effect ) ;
297+ state . subscriptions . get ( dep . name ) . add ( effect ) ;
298298
299- } else if ( dependency . type === "attribute" ) {
300- reactivity . _subscribeAttributeDep ( dependency . element , dependency . name , effect ) ;
299+ } else if ( dep . type === "attribute" ) {
300+ reactivity . _subscribeAttributeDependency ( dep . element , dep . name , effect ) ;
301301
302- } else if ( dependency . type === "property" ) {
303- reactivity . _subscribePropertyDep ( dependency . element , dependency . name , effect ) ;
302+ } else if ( dep . type === "property" ) {
303+ reactivity . _subscribePropertyDependency ( dep . element , dep . name , effect ) ;
304304 }
305305 }
306306 }
@@ -312,7 +312,7 @@ export class Reactivity {
312312 * @param {string } attrName
313313 * @param {Effect } effect
314314 */
315- _subscribeAttributeDep ( element , attrName , effect ) {
315+ _subscribeAttributeDependency ( element , attrName , effect ) {
316316 var reactivity = this ;
317317 var state = getElementState ( element ) ;
318318
@@ -347,7 +347,7 @@ export class Reactivity {
347347 * @param {string } propName
348348 * @param {Effect } effect
349349 */
350- _subscribePropertyDep ( element , propName , effect ) {
350+ _subscribePropertyDependency ( element , propName , effect ) {
351351 var reactivity = this ;
352352 var state = getElementState ( element ) ;
353353
@@ -376,33 +376,33 @@ export class Reactivity {
376376
377377 /** @param {Effect } effect */
378378 _unsubscribeEffect ( effect ) {
379- for ( var [ depKey , dependency ] of effect . dependencies ) {
380- if ( dependency . type === "symbol" && dependency . scope === "global" ) {
381- var subs = globalSubscriptions . get ( dependency . name ) ;
379+ for ( var [ depKey , dep ] of effect . dependencies ) {
380+ if ( dep . type === "symbol" && dep . scope === "global" ) {
381+ var subs = globalSubscriptions . get ( dep . name ) ;
382382 if ( subs ) {
383383 subs . delete ( effect ) ;
384384 if ( subs . size === 0 ) {
385- globalSubscriptions . delete ( dependency . name ) ;
385+ globalSubscriptions . delete ( dep . name ) ;
386386 }
387387 }
388- } else if ( dependency . type === "symbol" && dependency . scope === "element" ) {
389- var state = getElementState ( dependency . element ) ;
388+ } else if ( dep . type === "symbol" && dep . scope === "element" ) {
389+ var state = getElementState ( dep . element ) ;
390390 if ( state . subscriptions ) {
391- var subs = state . subscriptions . get ( dependency . name ) ;
391+ var subs = state . subscriptions . get ( dep . name ) ;
392392 if ( subs ) {
393393 subs . delete ( effect ) ;
394394 if ( subs . size === 0 ) {
395- state . subscriptions . delete ( dependency . name ) ;
395+ state . subscriptions . delete ( dep . name ) ;
396396 }
397397 }
398398 }
399- } else if ( dependency . type === "attribute" && dependency . element ) {
400- var state = getElementState ( dependency . element ) ;
401- if ( state . attributeObservers && state . attributeObservers [ dependency . name ] ) {
402- state . attributeObservers [ dependency . name ] . effects . delete ( effect ) ;
399+ } else if ( dep . type === "attribute" && dep . element ) {
400+ var state = getElementState ( dep . element ) ;
401+ if ( state . attributeObservers && state . attributeObservers [ dep . name ] ) {
402+ state . attributeObservers [ dep . name ] . effects . delete ( effect ) ;
403403 }
404- } else if ( dependency . type === "property" && dependency . element ) {
405- var state = getElementState ( dependency . element ) ;
404+ } else if ( dep . type === "property" && dep . element ) {
405+ var state = getElementState ( dep . element ) ;
406406 if ( state . propertyHandler ) {
407407 state . propertyHandler . effects . delete ( effect ) ;
408408 }
@@ -463,18 +463,18 @@ export class Reactivity {
463463 effect . isStopped = true ;
464464 this . _unsubscribeEffect ( effect ) ;
465465 // Clean up per-element listeners and observers if no effects remain
466- for ( var [ depKey , dependency ] of effect . dependencies ) {
467- if ( dependency . type === "attribute" && dependency . element ) {
468- var state = getElementState ( dependency . element ) ;
469- if ( state . attributeObservers && state . attributeObservers [ dependency . name ] ) {
470- var obs = state . attributeObservers [ dependency . name ] ;
466+ for ( var [ depKey , dep ] of effect . dependencies ) {
467+ if ( dep . type === "attribute" && dep . element ) {
468+ var state = getElementState ( dep . element ) ;
469+ if ( state . attributeObservers && state . attributeObservers [ dep . name ] ) {
470+ var obs = state . attributeObservers [ dep . name ] ;
471471 if ( obs . effects . size === 0 ) {
472472 obs . observer . disconnect ( ) ;
473- delete state . attributeObservers [ dependency . name ] ;
473+ delete state . attributeObservers [ dep . name ] ;
474474 }
475475 }
476- } else if ( dependency . type === "property" && dependency . element ) {
477- var state = getElementState ( dependency . element ) ;
476+ } else if ( dep . type === "property" && dep . element ) {
477+ var state = getElementState ( dep . element ) ;
478478 if ( state . propertyHandler && state . propertyHandler . effects . size === 0 ) {
479479 state . propertyHandler . remove ( ) ;
480480 state . propertyHandler = null ;
0 commit comments