From 709b62fd2a10cf3613d5c375e1d8ede26cb0fb7f Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 18:02:44 +0200
Subject: [PATCH 01/14] added input select to media_player

---
 src/cards/ha-media_player-card.html        | 29 ++++++++++++++++++++++
 src/cards/ha-media_player-card.js          | 29 ++++++++++++++++++++--
 src/more-infos/more-info-media_player.html | 15 +++++++++++
 src/more-infos/more-info-media_player.js   | 27 ++++++++++++++++++++
 4 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html
index 66ca70b682..5f05c2b81b 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.html
@@ -55,6 +55,13 @@
       top: 91px;
     }
 
+    .source-container {
+      position: absolute;
+      left: 8px;
+      right: 8px;
+      top: 170px;
+    }
+
     .controls {
       @apply(--paper-font-body1);
       padding: 8px;
@@ -138,6 +145,28 @@
             class='self-center'
           ></paper-icon-button>
         </div>
+        <div
+          class='controls layout horizontal justified'
+          invisible$='[[!playerObj.supportsSelectInputSource]]'
+        >
+          <paper-icon-button
+            icon="mdi:login-variant">
+          </paper-icon-button>
+          <paper-dropdown-menu selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
+            <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
+              <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
+                <paper-item>[[item]]</paper-item>
+              </template>
+            </paper-menu>
+          </paper-dropdown-menu>
+        </div>
+      </paper-material>
+    </div>
+
+    <div class='source-container'
+      >
+      <paper-material elevation="1">
+
       </paper-material>
     </div>
   </template>
diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js
index c658c4bb62..34c24b44b1 100644
--- a/src/cards/ha-media_player-card.js
+++ b/src/cards/ha-media_player-card.js
@@ -1,7 +1,7 @@
 import Polymer from '../polymer';
 import hass from '../util/home-assistant-js-instance';
 
-const { moreInfoActions } = hass;
+const { moreInfoActions, serviceActions } = hass;
 
 export default new Polymer({
   is: 'ha-media_player-card',
@@ -27,6 +27,11 @@ export default new Polymer({
       computed: 'computePlaybackControlIcon(playerObj)',
     },
 
+    selectedSource: {
+      type: String,
+      observer: 'selectedSourceChanged',
+    },
+
     /**
      * The z-depth of the card, from 0-5.
      */
@@ -38,7 +43,11 @@ export default new Polymer({
   },
 
   playerObjChanged(playerObj) {
-    this.style.height = this.computeShowControls(playerObj) ? '175px' : '78px';
+    this.style.height = '78px';
+    if (this.computeShowControls(playerObj)) {
+        this.style.height = playerObj.supportsSelectInputSource ? '232px' : '175px';
+    }
+
     this.style.backgroundImage = playerObj.stateObj.attributes.entity_picture ?
       `url(${playerObj.stateObj.attributes.entity_picture})` : '';
   },
@@ -76,6 +85,18 @@ 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();
@@ -111,4 +132,8 @@ export default new Polymer({
     this.playerObj.volumeMute(!this.playerObj.isMuted);
   },
 
+  stopPropagation(ev) {
+    ev.stopPropagation();
+  },
+
 });
diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 0453dac3d2..b9034e9b33 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -64,6 +64,21 @@
           on-change='volumeSliderChanged' class='flex'>
         </paper-slider>
       </div>
+      <div
+          class='controls layout horizontal justified'
+          hidden$='[[!supportsSelectInputSource]]'
+        >
+          <paper-icon-button
+            icon="mdi:login-variant">
+          </paper-icon-button>
+          <paper-dropdown-menu style="margin-left: 10px;" no-label-float selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
+            <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
+              <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
+                <paper-item>[[item]]</paper-item>
+              </template>
+            </paper-menu>
+          </paper-dropdown-menu>
+        </div>
     </div>
   </template>
 </dom-module>
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 6f58c65ebf..72ade7d32b 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -75,11 +75,21 @@ export default new Polymer({
       value: false,
     },
 
+    supportsSelectInputSource: {
+      type: Boolean,
+      value: false,
+    },
+
     hasMediaControl: {
       type: Boolean,
       value: false,
     },
 
+    selectedSource: {
+      type: String,
+      observer: 'selectedSourceChanged',
+    },
+
   },
 
   stateObjChanged(newVal) {
@@ -99,6 +109,7 @@ export default new Polymer({
       this.supportsTurnOn = (newVal.attributes.supported_media_commands & 128) !== 0;
       this.supportsTurnOff = (newVal.attributes.supported_media_commands & 256) !== 0;
       this.supportsVolumeButtons = (newVal.attributes.supported_media_commands & 1024) !== 0;
+      this.supportsSelectInputSource = (newVal.attributes.supported_media_commands & 2048) !== 0;
     }
 
     this.async(() => this.fire('iron-resize'), 500);
@@ -135,6 +146,18 @@ export default new Polymer({
     return isOff ? !supportsTurnOn : !supportsTurnOff;
   },
 
+  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.callService('select_source', { source: option });
+  },
+
   handleTogglePower() {
     this.callService(this.isOff ? 'turn_on' : 'turn_off');
   },
@@ -186,4 +209,8 @@ export default new Polymer({
     serviceData.entity_id = this.stateObj.entityId;
     serviceActions.callService('media_player', service, serviceData);
   },
+
+  stopPropagation(ev) {
+    ev.stopPropagation();
+  },
 });

From 583e8e67261102d00c638e14001a139de27b52b0 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 18:08:57 +0200
Subject: [PATCH 02/14] updated commit parent hash

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5b509adecb..356c77ed2f 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",
   "dependencies": {
-    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#7dc486d2195435eca2c0e194c1f6ca7ee3163138",
+    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#f92320adc57c8f8d917376ff680476dcb25cd029",
     "lodash": "^4.8.2",
     "moment": "^2.12.0"
   },

From 916de139ef52c3642ce904a17aed8ba3708797c7 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 18:11:58 +0200
Subject: [PATCH 03/14] fixed code style

---
 src/cards/ha-media_player-card.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js
index 34c24b44b1..b556371aca 100644
--- a/src/cards/ha-media_player-card.js
+++ b/src/cards/ha-media_player-card.js
@@ -1,7 +1,7 @@
 import Polymer from '../polymer';
 import hass from '../util/home-assistant-js-instance';
 
-const { moreInfoActions, serviceActions } = hass;
+const { moreInfoActions } = hass;
 
 export default new Polymer({
   is: 'ha-media_player-card',
@@ -45,7 +45,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 = playerObj.supportsSelectInputSource ? '232px' : '175px';
     }
 
     this.style.backgroundImage = playerObj.stateObj.attributes.entity_picture ?

From 40b19006f1887c979929ce98716cf0080ed9a3d5 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 18:25:11 +0200
Subject: [PATCH 04/14] fixed layout

---
 src/cards/ha-media_player-card.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html
index 5f05c2b81b..a057087097 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.html
@@ -152,7 +152,7 @@
           <paper-icon-button
             icon="mdi:login-variant">
           </paper-icon-button>
-          <paper-dropdown-menu selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
+          <paper-dropdown-menu no-label-float selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
             <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
               <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
                 <paper-item>[[item]]</paper-item>

From 4398fcdec3256365543144fcdcc222fd76f635f0 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 18:38:54 +0200
Subject: [PATCH 05/14] 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'
           ></paper-icon-button>
         </div>
-        <div
-          class='controls layout horizontal justified'
-          invisible$='[[!playerObj.supportsSelectInputSource]]'
-        >
-          <paper-icon-button
-            icon="mdi:login-variant">
-          </paper-icon-button>
-          <paper-dropdown-menu no-label-float selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
-            <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
-              <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
-                <paper-item>[[item]]</paper-item>
-              </template>
-            </paper-menu>
-          </paper-dropdown-menu>
-        </div>
-      </paper-material>
-    </div>
-
-    <div class='source-container'
-      >
-      <paper-material elevation="1">
-
       </paper-material>
     </div>
   </template>
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();
-  },
-
 });

From 0921fdb63dc2ae38a575ed834ca8c452e29d2277 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 22:15:56 +0200
Subject: [PATCH 06/14] reverted package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 356c77ed2f..5b509adecb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",
   "dependencies": {
-    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#f92320adc57c8f8d917376ff680476dcb25cd029",
+    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#7dc486d2195435eca2c0e194c1f6ca7ee3163138",
     "lodash": "^4.8.2",
     "moment": "^2.12.0"
   },

From bc03090e8a0a8d96ef4f68c505c164fe564804eb Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 22:18:42 +0200
Subject: [PATCH 07/14] code cleanup

---
 src/more-infos/more-info-media_player.html |  9 ++-------
 src/more-infos/more-info-media_player.js   | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index b9034e9b33..037b6ab3af 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -64,13 +64,8 @@
           on-change='volumeSliderChanged' class='flex'>
         </paper-slider>
       </div>
-      <div
-          class='controls layout horizontal justified'
-          hidden$='[[!supportsSelectInputSource]]'
-        >
-          <paper-icon-button
-            icon="mdi:login-variant">
-          </paper-icon-button>
+      <div class='controls layout horizontal justified' hidden$='[[!supportsSelectSource]]'>
+          <paper-icon-button icon="mdi:login-variant"></paper-icon-button>
           <paper-dropdown-menu style="margin-left: 10px;" no-label-float selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
             <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
               <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 72ade7d32b..0b7b828f26 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -75,7 +75,7 @@ export default new Polymer({
       value: false,
     },
 
-    supportsSelectInputSource: {
+    supportsSelectSource: {
       type: Boolean,
       value: false,
     },
@@ -87,7 +87,7 @@ export default new Polymer({
 
     selectedSource: {
       type: String,
-      observer: 'selectedSourceChanged',
+      observer: 'handleSourceChanged',
     },
 
   },
@@ -109,7 +109,7 @@ export default new Polymer({
       this.supportsTurnOn = (newVal.attributes.supported_media_commands & 128) !== 0;
       this.supportsTurnOff = (newVal.attributes.supported_media_commands & 256) !== 0;
       this.supportsVolumeButtons = (newVal.attributes.supported_media_commands & 1024) !== 0;
-      this.supportsSelectInputSource = (newVal.attributes.supported_media_commands & 2048) !== 0;
+      this.supportsSelectSource = (newVal.attributes.supported_media_commands & 2048) !== 0;
     }
 
     this.async(() => this.fire('iron-resize'), 500);
@@ -150,14 +150,6 @@ export default new Polymer({
     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.callService('select_source', { source: option });
-  },
-
   handleTogglePower() {
     this.callService(this.isOff ? 'turn_on' : 'turn_off');
   },
@@ -174,6 +166,14 @@ export default new Polymer({
     this.callService('media_next_track');
   },
 
+  handleSourceChanged(source) {
+    // Selected Option will transition to '' before transitioning to new value
+    if (source === '' || source === this.stateObj.attributes.source) {
+      return;
+    }
+    this.callService('select_source', { source: source });
+  },
+
   handleVolumeTap() {
     if (!this.supportsVolumeMute) {
       return;

From 9197d358d22c61339ede3f4484923ff092ad4a32 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Mon, 11 Apr 2016 22:28:52 +0200
Subject: [PATCH 08/14] fixed code style

---
 src/more-infos/more-info-media_player.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 0b7b828f26..45faeec61c 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -166,12 +166,12 @@ export default new Polymer({
     this.callService('media_next_track');
   },
 
-  handleSourceChanged(source) {
+  handleSourceChanged(sourceInput) {
     // Selected Option will transition to '' before transitioning to new value
-    if (source === '' || source === this.stateObj.attributes.source) {
+    if (sourceInput === '' || sourceInput === this.stateObj.attributes.source) {
       return;
     }
-    this.callService('select_source', { source: source });
+    this.callService('select_source', { source: sourceInput });
   },
 
   handleVolumeTap() {

From 87067ea16f3591270c65c3d0985ce376bafd9f94 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Tue, 12 Apr 2016 12:12:20 +0200
Subject: [PATCH 09/14] code review fixes

---
 src/more-infos/more-info-media_player.html | 10 ++++---
 src/more-infos/more-info-media_player.js   | 31 +++++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 037b6ab3af..e3dc9b2f7d 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -24,6 +24,10 @@
     .has-volume_level .volume {
       max-height: 40px;
     }
+
+    .source-input {
+      margin-left: 10px;
+    }
   </style>
   <template>
     <div class$='[[computeClassNames(stateObj)]]'>
@@ -65,9 +69,9 @@
         </paper-slider>
       </div>
       <div class='controls layout horizontal justified' hidden$='[[!supportsSelectSource]]'>
-          <paper-icon-button icon="mdi:login-variant"></paper-icon-button>
-          <paper-dropdown-menu style="margin-left: 10px;" no-label-float selected-item-label='{{selectedSource}}' on-tap='stopPropagation'>
-            <paper-menu class="dropdown-content" selected="[[computeSelectedSource(stateObj)]]">
+          <iron-icon icon="mdi:login-variant"></iron-icon>
+          <paper-dropdown-menu class="source-input" no-label-float label='[[source]]'>
+            <paper-menu class="dropdown-content" selected="{{sourceIndex}}">
               <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
                 <paper-item>[[item]]</paper-item>
               </template>
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 45faeec61c..e81125b31b 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -30,6 +30,17 @@ export default new Polymer({
       value: false,
     },
 
+    source: {
+      type: String,
+      value: '',
+    },
+
+    sourceIndex: {
+        type: Number,
+        value: 0,
+        observer: 'handleSourceChanged',
+    },
+
     volumeSliderValue: {
       type: Number,
       value: 0,
@@ -85,11 +96,6 @@ export default new Polymer({
       value: false,
     },
 
-    selectedSource: {
-      type: String,
-      observer: 'handleSourceChanged',
-    },
-
   },
 
   stateObjChanged(newVal) {
@@ -101,6 +107,8 @@ export default new Polymer({
       this.hasMediaControl = hasMediaStates.indexOf(newVal.state) !== -1;
       this.volumeSliderValue = newVal.attributes.volume_level * 100;
       this.isMuted = newVal.attributes.is_volume_muted;
+      this.source = newVal.attributes.source;
+      this.sourceIndex = newVal.attributes.source_list.indexOf(this.source)
       this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0;
       this.supportsVolumeSet = (newVal.attributes.supported_media_commands & 4) !== 0;
       this.supportsVolumeMute = (newVal.attributes.supported_media_commands & 8) !== 0;
@@ -166,11 +174,20 @@ export default new Polymer({
     this.callService('media_next_track');
   },
 
-  handleSourceChanged(sourceInput) {
+  handleSourceChanged(sourceIndex) {
     // Selected Option will transition to '' before transitioning to new value
-    if (sourceInput === '' || sourceInput === this.stateObj.attributes.source) {
+    if (!this.stateObj
+        || sourceIndex < 0
+        || sourceIndex >= this.stateObj.attributes.source_list.length
+    ) {
       return;
     }
+
+    var sourceInput = this.stateObj.attributes.source_list[sourceIndex];
+    if (sourceInput == this.stateObj.attributes.source) {
+      return;
+    }
+
     this.callService('select_source', { source: sourceInput });
   },
 

From eaeff8434dc81044fffb29026c8e107d6d060cf8 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Tue, 12 Apr 2016 12:25:37 +0200
Subject: [PATCH 10/14] fixed code style

---
 src/more-infos/more-info-media_player.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index e81125b31b..2292fb43e0 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -36,9 +36,9 @@ export default new Polymer({
     },
 
     sourceIndex: {
-        type: Number,
-        value: 0,
-        observer: 'handleSourceChanged',
+      type: Number,
+      value: 0,
+      observer: 'handleSourceChanged',
     },
 
     volumeSliderValue: {
@@ -108,7 +108,7 @@ export default new Polymer({
       this.volumeSliderValue = newVal.attributes.volume_level * 100;
       this.isMuted = newVal.attributes.is_volume_muted;
       this.source = newVal.attributes.source;
-      this.sourceIndex = newVal.attributes.source_list.indexOf(this.source)
+      this.sourceIndex = newVal.attributes.source_list.indexOf(this.source);
       this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0;
       this.supportsVolumeSet = (newVal.attributes.supported_media_commands & 4) !== 0;
       this.supportsVolumeMute = (newVal.attributes.supported_media_commands & 8) !== 0;
@@ -183,8 +183,8 @@ export default new Polymer({
       return;
     }
 
-    var sourceInput = this.stateObj.attributes.source_list[sourceIndex];
-    if (sourceInput == this.stateObj.attributes.source) {
+    const sourceInput = this.stateObj.attributes.source_list[sourceIndex];
+    if (sourceInput === this.stateObj.attributes.source) {
       return;
     }
 

From c53a8564c166f3f75615f48fd3964ca5b4781aa0 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Tue, 12 Apr 2016 17:21:20 +0200
Subject: [PATCH 11/14] check for attribute

---
 src/more-infos/more-info-media_player.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 2292fb43e0..1dbfebc64e 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -108,7 +108,7 @@ export default new Polymer({
       this.volumeSliderValue = newVal.attributes.volume_level * 100;
       this.isMuted = newVal.attributes.is_volume_muted;
       this.source = newVal.attributes.source;
-      this.sourceIndex = newVal.attributes.source_list.indexOf(this.source);
+      this.sourceIndex = newVal.attributes.source_list === undefined ? 0 : newVal.attributes.source_list.indexOf(this.source);
       this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0;
       this.supportsVolumeSet = (newVal.attributes.supported_media_commands & 4) !== 0;
       this.supportsVolumeMute = (newVal.attributes.supported_media_commands & 8) !== 0;
@@ -177,6 +177,7 @@ export default new Polymer({
   handleSourceChanged(sourceIndex) {
     // Selected Option will transition to '' before transitioning to new value
     if (!this.stateObj
+        || this.stateObj.attributes.source_list === undefined
         || sourceIndex < 0
         || sourceIndex >= this.stateObj.attributes.source_list.length
     ) {

From 5e9ac5d49bc5bfee38c7b46a23533f611c9159fb Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Tue, 12 Apr 2016 17:21:29 +0200
Subject: [PATCH 12/14] fixed style

---
 src/more-infos/more-info-media_player.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index e3dc9b2f7d..4e16485f2f 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -25,7 +25,11 @@
       max-height: 40px;
     }
 
-    .source-input {
+    iron-icon.source-input {
+      padding: 7px;
+    }
+
+    paper-dropdown-menu.source-input {
       margin-left: 10px;
     }
   </style>
@@ -69,7 +73,7 @@
         </paper-slider>
       </div>
       <div class='controls layout horizontal justified' hidden$='[[!supportsSelectSource]]'>
-          <iron-icon icon="mdi:login-variant"></iron-icon>
+          <iron-icon class="source-input" icon="mdi:login-variant"></iron-icon>
           <paper-dropdown-menu class="source-input" no-label-float label='[[source]]'>
             <paper-menu class="dropdown-content" selected="{{sourceIndex}}">
               <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>

From 40f30b3f18dd776bce3f0e6c5f7f904153dc3abc Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Tue, 12 Apr 2016 17:27:29 +0200
Subject: [PATCH 13/14] fixed code style

---
 src/more-infos/more-info-media_player.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 1dbfebc64e..585bd37a29 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -108,7 +108,7 @@ export default new Polymer({
       this.volumeSliderValue = newVal.attributes.volume_level * 100;
       this.isMuted = newVal.attributes.is_volume_muted;
       this.source = newVal.attributes.source;
-      this.sourceIndex = newVal.attributes.source_list === undefined ? 0 : newVal.attributes.source_list.indexOf(this.source);
+      this.sourceIndex = 0;
       this.supportsPause = (newVal.attributes.supported_media_commands & 1) !== 0;
       this.supportsVolumeSet = (newVal.attributes.supported_media_commands & 4) !== 0;
       this.supportsVolumeMute = (newVal.attributes.supported_media_commands & 8) !== 0;
@@ -118,6 +118,10 @@ export default new Polymer({
       this.supportsTurnOff = (newVal.attributes.supported_media_commands & 256) !== 0;
       this.supportsVolumeButtons = (newVal.attributes.supported_media_commands & 1024) !== 0;
       this.supportsSelectSource = (newVal.attributes.supported_media_commands & 2048) !== 0;
+
+      if (newVal.attributes.source_list !== undefined) {
+        this.sourceIndex = newVal.attributes.source_list.indexOf(this.source);
+      }
     }
 
     this.async(() => this.fire('iron-resize'), 500);

From 3e7d774704437582d6aea11237604e85a12a5b22 Mon Sep 17 00:00:00 2001
From: Dennis Karpienski <dennis@karpienski.de>
Date: Thu, 14 Apr 2016 09:16:42 +0200
Subject: [PATCH 14/14] removed unused code and added floating label

---
 src/more-infos/more-info-media_player.html | 3 ++-
 src/more-infos/more-info-media_player.js   | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/more-infos/more-info-media_player.html b/src/more-infos/more-info-media_player.html
index 4e16485f2f..7c0a394e8d 100644
--- a/src/more-infos/more-info-media_player.html
+++ b/src/more-infos/more-info-media_player.html
@@ -27,6 +27,7 @@
 
     iron-icon.source-input {
       padding: 7px;
+      margin-top: 15px;
     }
 
     paper-dropdown-menu.source-input {
@@ -74,7 +75,7 @@
       </div>
       <div class='controls layout horizontal justified' hidden$='[[!supportsSelectSource]]'>
           <iron-icon class="source-input" icon="mdi:login-variant"></iron-icon>
-          <paper-dropdown-menu class="source-input" no-label-float label='[[source]]'>
+          <paper-dropdown-menu class="source-input" label-float label='Source'>
             <paper-menu class="dropdown-content" selected="{{sourceIndex}}">
               <template is='dom-repeat' items='[[stateObj.attributes.source_list]]'>
                 <paper-item>[[item]]</paper-item>
diff --git a/src/more-infos/more-info-media_player.js b/src/more-infos/more-info-media_player.js
index 585bd37a29..f43fef9ce8 100644
--- a/src/more-infos/more-info-media_player.js
+++ b/src/more-infos/more-info-media_player.js
@@ -231,8 +231,4 @@ export default new Polymer({
     serviceData.entity_id = this.stateObj.entityId;
     serviceActions.callService('media_player', service, serviceData);
   },
-
-  stopPropagation(ev) {
-    ev.stopPropagation();
-  },
 });