Media Player: Standardize computePlaybackControlIcon (#1571)

* standardize computePlaybackControlIcon and add play/pause icon for UNKNOWN state

* fix linting errors
This commit is contained in:
Jason Hunter 2018-08-15 04:45:36 -04:00 committed by Paulus Schoutsen
parent 496e05651e
commit decbbc9acd
2 changed files with 10 additions and 2 deletions

View File

@ -275,7 +275,10 @@ class HaMediaPlayerCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
computePlaybackControlIcon(playerObj) { computePlaybackControlIcon(playerObj) {
if (playerObj.isPlaying) { if (playerObj.isPlaying) {
return playerObj.supportsPause ? 'hass:pause' : 'hass:stop'; return playerObj.supportsPause ? 'hass:pause' : 'hass:stop';
} else if (playerObj.isPaused || playerObj.isOff || playerObj.isIdle) { } else if (playerObj.hasMediaControl || playerObj.isOff || playerObj.isIdle) {
if (playerObj.hasMediaControl && playerObj.supportsPause && !playerObj.isPaused) {
return 'hass:play-pause';
}
return playerObj.supportsPlay ? 'hass:play' : null; return playerObj.supportsPlay ? 'hass:play' : null;
} }
return ''; return '';

View File

@ -194,9 +194,14 @@ class MoreInfoMediaPlayer extends LocalizeMixin(EventsMixin(PolymerElement)) {
computePlaybackControlIcon(playerObj) { computePlaybackControlIcon(playerObj) {
if (playerObj.isPlaying) { if (playerObj.isPlaying) {
return playerObj.supportsPause ? 'hass:pause' : 'hass:stop'; return playerObj.supportsPause ? 'hass:pause' : 'hass:stop';
} else if (playerObj.hasMediaControl || playerObj.isOff || playerObj.isIdle) {
if (playerObj.hasMediaControl && playerObj.supportsPause && !playerObj.isPaused) {
return 'hass:play-pause';
} }
return playerObj.supportsPlay ? 'hass:play' : null; return playerObj.supportsPlay ? 'hass:play' : null;
} }
return '';
}
computeHidePowerButton(playerObj) { computeHidePowerButton(playerObj) {
return playerObj.isOff ? !playerObj.supportsTurnOn : !playerObj.supportsTurnOff; return playerObj.isOff ? !playerObj.supportsTurnOn : !playerObj.supportsTurnOff;