Don't use window to share CoverEntity (#1192)

* Don't use window to share CoverEntity

* Lint
This commit is contained in:
Paulus Schoutsen 2018-05-19 16:21:29 -04:00 committed by GitHub
parent 4a734fbffc
commit d7b2a03880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 11 deletions

View File

@ -2,7 +2,7 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js'; import { html } from '@polymer/polymer/lib/utils/html-tag.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '../util/cover-model.js'; import CoverEntity from '../util/cover-model.js';
class HaCoverControls extends PolymerElement { class HaCoverControls extends PolymerElement {
static get template() { static get template() {
@ -39,7 +39,7 @@ class HaCoverControls extends PolymerElement {
}; };
} }
computeEntityObj(hass, stateObj) { computeEntityObj(hass, stateObj) {
return new window.CoverEntity(hass, stateObj); return new CoverEntity(hass, stateObj);
} }
computeOpenDisabled(stateObj, entityObj) { computeOpenDisabled(stateObj, entityObj) {
var assumedState = stateObj.attributes.assumed_state === true; var assumedState = stateObj.attributes.assumed_state === true;

View File

@ -3,7 +3,7 @@ import '@polymer/paper-icon-button/paper-icon-button.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js'; import { html } from '@polymer/polymer/lib/utils/html-tag.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '../util/cover-model.js'; import CoverEntity from '../util/cover-model.js';
class HaCoverTiltControls extends PolymerElement { class HaCoverTiltControls extends PolymerElement {
static get template() { static get template() {
@ -38,7 +38,7 @@ class HaCoverTiltControls extends PolymerElement {
}; };
} }
computeEntityObj(hass, stateObj) { computeEntityObj(hass, stateObj) {
return new window.CoverEntity(hass, stateObj); return new CoverEntity(hass, stateObj);
} }
computeOpenDisabled(stateObj, entityObj) { computeOpenDisabled(stateObj, entityObj) {
var assumedState = stateObj.attributes.assumed_state === true; var assumedState = stateObj.attributes.assumed_state === true;

View File

@ -5,7 +5,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '../../../components/ha-cover-tilt-controls.js'; import '../../../components/ha-cover-tilt-controls.js';
import '../../../components/ha-paper-slider.js'; import '../../../components/ha-paper-slider.js';
import '../../../util/cover-model.js'; import CoverEntity from '../../../util/cover-model.js';
import attributeClassNames from '../../../common/entity/attribute_class_names'; import attributeClassNames from '../../../common/entity/attribute_class_names';
import featureClassNames from '../../../common/entity/feature_class_names'; import featureClassNames from '../../../common/entity/feature_class_names';
@ -82,7 +82,7 @@ import featureClassNames from '../../../common/entity/feature_class_names';
} }
computeEntityObj(hass, stateObj) { computeEntityObj(hass, stateObj) {
return new window.CoverEntity(hass, stateObj); return new CoverEntity(hass, stateObj);
} }
stateObjChanged(newVal) { stateObjChanged(newVal) {

View File

@ -5,6 +5,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '../components/entity/state-info.js'; import '../components/entity/state-info.js';
import '../components/ha-cover-controls.js'; import '../components/ha-cover-controls.js';
import '../components/ha-cover-tilt-controls.js'; import '../components/ha-cover-tilt-controls.js';
import CoverEntity from '../util/cover-model.js';
class StateCardCover extends PolymerElement { class StateCardCover extends PolymerElement {
static get template() { static get template() {
@ -42,7 +43,7 @@ class StateCardCover extends PolymerElement {
} }
computeEntityObj(hass, stateObj) { computeEntityObj(hass, stateObj) {
var entity = new window.CoverEntity(hass, stateObj); var entity = new CoverEntity(hass, stateObj);
return entity; return entity;
} }
} }

View File

@ -1,11 +1,11 @@
window.CoverEntity = function (hass, stateObj) { export default function CoverEntity(hass, stateObj) {
this.hass = hass; this.hass = hass;
this.stateObj = stateObj; this.stateObj = stateObj;
}; }
function addGetter(name, getter) { function addGetter(name, getter) {
Object.defineProperty( Object.defineProperty(
window.CoverEntity.prototype, name, CoverEntity.prototype, name,
{ get: getter } { get: getter }
); );
} }
@ -74,7 +74,7 @@ addGetter('isTiltOnly', function () {
/* eslint-enable no-bitwise */ /* eslint-enable no-bitwise */
Object.assign(window.CoverEntity.prototype, { Object.assign(CoverEntity.prototype, {
openCover: function () { openCover: function () {
this.callService('open_cover'); this.callService('open_cover');
}, },