@@ -647,10 +647,11 @@ class _TextAndGraphicManagerBase extends _SubManagerBase {
647647 _shouldUpdatePrimaryImage ( ) {
648648 const templateSupportsPrimaryArtwork = this . _templateSupportsImageField ( ImageFieldName . graphic ) ;
649649
650- const currentScreenDataPrimaryGraphicName = ( currentScreenData !== null && currentScreenData . getGraphic ( ) !== null ) ? currentScreenData . getGraphic ( ) . getValue ( ) : null ;
650+ const currentScreenDataPrimaryGraphicName = ( this . _currentScreenData !== null && this . _currentScreenData . getGraphic ( ) !== null ) ? this . _currentScreenData . getGraphic ( ) . getValueParam ( ) : null ;
651651 const primaryGraphicName = this . _primaryGraphic !== null ? this . _primaryGraphic . getName ( ) : null ;
652+
652653 return templateSupportsPrimaryArtwork
653- && ( `${ currentScreenDataPrimaryGraphicName } ` ) . toLowerCase ( ) = == ( `${ primaryGraphicName } ` ) . toLowerCase ( )
654+ && ( `${ currentScreenDataPrimaryGraphicName } ` ) . toLowerCase ( ) ! == ( `${ primaryGraphicName } ` ) . toLowerCase ( )
654655 && this . _primaryGraphic !== null ;
655656 }
656657
@@ -662,10 +663,11 @@ class _TextAndGraphicManagerBase extends _SubManagerBase {
662663 _shouldUpdateSecondaryImage ( ) {
663664 const templateSupportsSecondaryArtwork = this . _templateSupportsImageField ( ImageFieldName . graphic ) || this . _templateSupportsImageField ( ImageFieldName . secondaryGraphic ) ;
664665
665- const currentScreenDataSecondaryGraphicName = ( currentScreenData !== null && currentScreenData . getSecondaryGraphic ( ) !== null ) ? currentScreenData . getSecondaryGraphic ( ) . getValue ( ) : null ;
666+ const currentScreenDataSecondaryGraphicName = ( this . _currentScreenData !== null && this . _currentScreenData . getSecondaryGraphic ( ) !== null ) ? this . _currentScreenData . getSecondaryGraphic ( ) . getValueParam ( ) : null ;
666667 const secondaryGraphicName = this . _secondaryGraphic !== null ? this . _secondaryGraphic . getName ( ) : null ;
668+
667669 return templateSupportsSecondaryArtwork
668- && ( `${ currentScreenDataSecondaryGraphicName } ` ) . toLowerCase ( ) = == ( `${ secondaryGraphicName } ` ) . toLowerCase ( )
670+ && ( `${ currentScreenDataSecondaryGraphicName } ` ) . toLowerCase ( ) ! == ( `${ secondaryGraphicName } ` ) . toLowerCase ( )
669671 && this . _secondaryGraphic !== null ;
670672 }
671673
@@ -694,7 +696,7 @@ class _TextAndGraphicManagerBase extends _SubManagerBase {
694696 * @return {Boolean } - True if text field is supported, false if not
695697 */
696698 _templateSupportsTextField ( name ) {
697- return this . _defaultMainWindowCapability === null || ManagerUtility . hasTextFieldOfName ( this . _defaultMainWindowCapability , name ) ;
699+ return this . _defaultMainWindowCapability === null || _ManagerUtility . hasTextFieldOfName ( this . _defaultMainWindowCapability , name ) ;
698700 }
699701
700702 /**
@@ -704,7 +706,7 @@ class _TextAndGraphicManagerBase extends _SubManagerBase {
704706 * @return {Boolean } - True if image field is supported, false if not
705707 */
706708 _templateSupportsImageField ( name ) {
707- return this . _defaultMainWindowCapability === null || ManagerUtility . hasImageFieldOfName ( this . _defaultMainWindowCapability , name ) ;
709+ return this . _defaultMainWindowCapability === null || _ManagerUtility . hasImageFieldOfName ( this . _defaultMainWindowCapability , name ) ;
708710 }
709711
710712 // SCREEN ITEM SETTERS AND GETTERS
0 commit comments