From 4398fcdec3256365543144fcdcc222fd76f635f0 Mon Sep 17 00:00:00 2001 From: Dennis Karpienski Date: Mon, 11 Apr 2016 18:38:54 +0200 Subject: [PATCH] reverted media player card --- src/cards/ha-media_player-card.html | 29 ----------------------------- src/cards/ha-media_player-card.js | 27 +-------------------------- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html index a057087097..66ca70b682 100644 --- a/src/cards/ha-media_player-card.html +++ b/src/cards/ha-media_player-card.html @@ -55,13 +55,6 @@ top: 91px; } - .source-container { - position: absolute; - left: 8px; - right: 8px; - top: 170px; - } - .controls { @apply(--paper-font-body1); padding: 8px; @@ -145,28 +138,6 @@ class='self-center' > -
- - - - - - - -
- - - -
- -
diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js index b556371aca..c658c4bb62 100644 --- a/src/cards/ha-media_player-card.js +++ b/src/cards/ha-media_player-card.js @@ -27,11 +27,6 @@ export default new Polymer({ computed: 'computePlaybackControlIcon(playerObj)', }, - selectedSource: { - type: String, - observer: 'selectedSourceChanged', - }, - /** * The z-depth of the card, from 0-5. */ @@ -43,11 +38,7 @@ export default new Polymer({ }, playerObjChanged(playerObj) { - this.style.height = '78px'; - if (this.computeShowControls(playerObj)) { - this.style.height = playerObj.supportsSelectInputSource ? '232px' : '175px'; - } - + this.style.height = this.computeShowControls(playerObj) ? '175px' : '78px'; this.style.backgroundImage = playerObj.stateObj.attributes.entity_picture ? `url(${playerObj.stateObj.attributes.entity_picture})` : ''; }, @@ -85,18 +76,6 @@ export default new Polymer({ return playerObj.isMuted ? 'mdi:volume-off' : 'mdi:volume-high'; }, - computeSelectedSource(stateObj) { - return stateObj.attributes.source_list.indexOf(stateObj.attributes.source); - }, - - selectedSourceChanged(option) { - // Selected Option will transition to '' before transitioning to new value - if (option === '' || option === this.stateObj.attributes.source) { - return; - } - this.playerObj.input(option); - }, - handleNext(ev) { ev.stopPropagation(); this.playerObj.nextTrack(); @@ -132,8 +111,4 @@ export default new Polymer({ this.playerObj.volumeMute(!this.playerObj.isMuted); }, - stopPropagation(ev) { - ev.stopPropagation(); - }, - });