From 4a734fbffc45784b9734fc0a489df64c3c34a6c1 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sat, 19 May 2018 16:12:49 -0400
Subject: [PATCH] Inline media player entity (#1191)

---
 src/cards/ha-media_player-card.js                        | 4 ++--
 src/dialogs/more-info/controls/more-info-media_player.js | 4 ++--
 src/state-summary/state-card-media_player.js             | 3 ++-
 src/util/hass-media-player-model.js                      | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js
index 07aca9626c..f1de924d7f 100644
--- a/src/cards/ha-media_player-card.js
+++ b/src/cards/ha-media_player-card.js
@@ -5,7 +5,7 @@ import '@polymer/paper-styles/element-styles/paper-material-styles.js';
 import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
-import '../util/hass-media-player-model.js';
+import HassMediaPlayerEntity from '../util/hass-media-player-model.js';
 
 import computeStateName from '../common/entity/compute_state_name.js';
 import EventsMixin from '../mixins/events-mixin.js';
@@ -261,7 +261,7 @@ class HaMediaPlayerCard extends LocalizeMixin(EventsMixin(PolymerElement)) {
   }
 
   computePlayerObj(hass, stateObj) {
-    return new window.HassMediaPlayerEntity(hass, stateObj);
+    return new HassMediaPlayerEntity(hass, stateObj);
   }
 
   computePrimaryText(localize, playerObj) {
diff --git a/src/dialogs/more-info/controls/more-info-media_player.js b/src/dialogs/more-info/controls/more-info-media_player.js
index f0ba849e78..5681d23104 100644
--- a/src/dialogs/more-info/controls/more-info-media_player.js
+++ b/src/dialogs/more-info/controls/more-info-media_player.js
@@ -8,7 +8,7 @@ import { html } from '@polymer/polymer/lib/utils/html-tag.js';
 import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../../../components/ha-paper-slider.js';
-import '../../../util/hass-media-player-model.js';
+import HassMediaPlayerEntity from '../../../util/hass-media-player-model.js';
 
 
 import attributeClassNames from '../../../common/entity/attribute_class_names';
@@ -136,7 +136,7 @@ import EventsMixin from '../../../mixins/events-mixin.js';
     }
 
     computePlayerObj(hass, stateObj) {
-      return new window.HassMediaPlayerEntity(hass, stateObj);
+      return new HassMediaPlayerEntity(hass, stateObj);
     }
 
     playerObjChanged(newVal, oldVal) {
diff --git a/src/state-summary/state-card-media_player.js b/src/state-summary/state-card-media_player.js
index a9bedbccf0..bea423f667 100644
--- a/src/state-summary/state-card-media_player.js
+++ b/src/state-summary/state-card-media_player.js
@@ -4,6 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 import '../components/entity/state-info.js';
 import LocalizeMixin from '../mixins/localize-mixin.js';
+import HassMediaPlayerEntity from '../util/hass-media-player-model.js';
 
 /*
  * @appliesMixin LocalizeMixin
@@ -66,7 +67,7 @@ class StateCardMediaPlayer extends LocalizeMixin(PolymerElement) {
   }
 
   computePlayerObj(hass, stateObj) {
-    return new window.HassMediaPlayerEntity(hass, stateObj);
+    return new HassMediaPlayerEntity(hass, stateObj);
   }
 
   computePrimaryText(localize, playerObj) {
diff --git a/src/util/hass-media-player-model.js b/src/util/hass-media-player-model.js
index e7a353e8e6..da311a78f0 100644
--- a/src/util/hass-media-player-model.js
+++ b/src/util/hass-media-player-model.js
@@ -1,11 +1,11 @@
-window.HassMediaPlayerEntity = function (hass, stateObj) {
+export default function HassMediaPlayerEntity(hass, stateObj) {
   this.hass = hass;
   this.stateObj = stateObj;
-};
+}
 
 function addGetter(name, getter) {
   Object.defineProperty(
-    window.HassMediaPlayerEntity.prototype, name,
+    HassMediaPlayerEntity.prototype, name,
     { get: getter }
   );
 }
@@ -144,7 +144,7 @@ addGetter('sourceList', function () {
   return this.stateObj.attributes.source_list;
 });
 
-Object.assign(window.HassMediaPlayerEntity.prototype, {
+Object.assign(HassMediaPlayerEntity.prototype, {
   mediaPlayPause: function () {
     this.callService('media_play_pause');
   },