Update eslint

This commit is contained in:
Paulus Schoutsen 2016-01-13 23:47:28 -08:00
parent a60ebb040c
commit cdc1437944
20 changed files with 138 additions and 134 deletions

View File

@ -1,4 +1,5 @@
{ {
"parser": "babel-eslint",
"extends": "airbnb/base", "extends": "airbnb/base",
"globals": { "globals": {
"__DEV__": false, "__DEV__": false,

View File

@ -35,8 +35,8 @@
"babel-preset-es2015": "^6.0.0", "babel-preset-es2015": "^6.0.0",
"bower": "^1.6.5", "bower": "^1.6.5",
"eslint": "^1.10.3", "eslint": "^1.10.3",
"eslint-config-airbnb": "^0.1.0",
"html-minifier": "^1.0.0", "html-minifier": "^1.0.0",
"eslint-config-airbnb": "^3.1.0",
"vulcanize": "^1.14.0", "vulcanize": "^1.14.0",
"webpack": "^1.12" "webpack": "^1.12"
} }

View File

@ -22,6 +22,6 @@ export default new Polymer({
entitySelected(ev) { entitySelected(ev) {
ev.preventDefault(); ev.preventDefault();
this.fire('entity-selected', {entityId: ev.model.entity.entityId}); this.fire('entity-selected', { entityId: ev.model.entity.entityId });
}, },
}); });

View File

@ -40,7 +40,7 @@ export default new Polymer({
}, },
listeners: { listeners: {
'tap': 'badgeTap', tap: 'badgeTap',
}, },
badgeTap(ev) { badgeTap(ev) {

View File

@ -72,7 +72,7 @@ export default new Polymer({
service = turnOn ? 'turn_on' : 'turn_off'; service = turnOn ? 'turn_on' : 'turn_off';
} }
serviceActions.callService(domain, service, {entity_id: this.stateObj.entityId}) serviceActions.callService(domain, service, { entity_id: this.stateObj.entityId })
.then(() => this.forceStateChange()); .then(() => this.forceStateChange());
}, },
}); });

View File

@ -21,7 +21,7 @@ export default new Polymer({
}, },
listeners: { listeners: {
'tap': 'badgeTap', tap: 'badgeTap',
}, },
badgeTap(ev) { badgeTap(ev) {
@ -41,58 +41,58 @@ export default new Polymer({
computeClasses(state) { computeClasses(state) {
switch (state.domain) { switch (state.domain) {
case 'scene': case 'scene':
return 'green'; return 'green';
case 'binary_sensor': case 'binary_sensor':
case 'script': case 'script':
return state.state === 'on' ? 'blue' : 'grey'; return state.state === 'on' ? 'blue' : 'grey';
case 'updater': case 'updater':
return 'blue'; return 'blue';
default: default:
return ''; return '';
} }
}, },
computeValue(state) { computeValue(state) {
switch (state.domain) { switch (state.domain) {
case 'binary_sensor': case 'binary_sensor':
case 'device_tracker': case 'device_tracker':
case 'updater': case 'updater':
case 'sun': case 'sun':
case 'scene': case 'scene':
case 'script': case 'script':
case 'alarm_control_panel': case 'alarm_control_panel':
return undefined; return undefined;
case 'sensor': case 'sensor':
return state.state; return state.state;
default: default:
return state.state; return state.state;
} }
}, },
computeIcon(state) { computeIcon(state) {
switch (state.domain) { switch (state.domain) {
case 'alarm_control_panel': case 'alarm_control_panel':
if (state.state === 'pending') { if (state.state === 'pending') {
return 'mdi:clock-fast'; return 'mdi:clock-fast';
} else if (state.state === 'armed_away') { } else if (state.state === 'armed_away') {
return 'mdi:nature'; return 'mdi:nature';
} else if (state.state === 'armed_home') { } else if (state.state === 'armed_home') {
return 'mdi:home-variant'; return 'mdi:home-variant';
} }
// state == 'disarmed' // state == 'disarmed'
return domainIcon(state.domain, state.state); return domainIcon(state.domain, state.state);
case 'binary_sensor': case 'binary_sensor':
case 'device_tracker': case 'device_tracker':
case 'scene': case 'scene':
case 'updater': case 'updater':
case 'script': case 'script':
return domainIcon(state.domain, state.state); return domainIcon(state.domain, state.state);
case 'sun': case 'sun':
return state.state === 'above_horizon' ? return state.state === 'above_horizon' ?
domainIcon(state.domain) : 'mdi:brightness-3'; domainIcon(state.domain) : 'mdi:brightness-3';
default: default:
return undefined; return undefined;
} }
}, },
@ -102,21 +102,21 @@ export default new Polymer({
computeLabel(state) { computeLabel(state) {
switch (state.domain) { switch (state.domain) {
case 'scene': case 'scene':
case 'script': case 'script':
return state.domain; return state.domain;
case 'device_tracker': case 'device_tracker':
return state.state === 'not_home' ? 'Away' : state.state; return state.state === 'not_home' ? 'Away' : state.state;
case 'alarm_control_panel': case 'alarm_control_panel':
if (state.state === 'pending') { if (state.state === 'pending') {
return 'pend'; return 'pend';
} else if (state.state === 'armed_away' || state.state === 'armed_home') { } else if (state.state === 'armed_away' || state.state === 'armed_home') {
return 'armed'; return 'armed';
} }
// state == 'disarmed' // state == 'disarmed'
return 'disarm'; return 'disarm';
default: default:
return state.attributes.unit_of_measurement; return state.attributes.unit_of_measurement;
} }
}, },

View File

@ -22,6 +22,6 @@ export default new Polymer({
eventSelected(ev) { eventSelected(ev) {
ev.preventDefault(); ev.preventDefault();
this.fire('event-selected', {eventType: ev.model.event.event}); this.fire('event-selected', { eventType: ev.model.event.event });
}, },
}); });

View File

@ -25,10 +25,10 @@ export default new Polymer({
}, },
listeners: { listeners: {
'mousedown': 'onMouseDown', mousedown: 'onMouseDown',
'mouseup': 'onMouseUp', mouseup: 'onMouseUp',
'touchstart': 'onTouchStart', touchstart: 'onTouchStart',
'touchend': 'onTouchEnd', touchend: 'onTouchEnd',
}, },
onMouseDown(ev) { onMouseDown(ev) {
@ -82,13 +82,13 @@ export default new Polymer({
onColorSelect(x, y) { onColorSelect(x, y) {
const data = this.context.getImageData(x, y, 1, 1).data; const data = this.context.getImageData(x, y, 1, 1).data;
this.setColor({r: data[0], g: data[1], b: data[2]}); this.setColor({ r: data[0], g: data[1], b: data[2] });
}, },
setColor(rgb) { setColor(rgb) {
this.color = rgb; this.color = rgb;
this.fire('colorselected', {rgb: this.color}); this.fire('colorselected', { rgb: this.color });
}, },
ready() { ready() {

View File

@ -84,7 +84,7 @@ export default new Polymer({
return; return;
} }
cards._columns[increaseIndex()].push(name); cards._columns[increaseIndex()].push(name);
cards[name] = {entities, groupEntity}; cards[name] = { entities, groupEntity };
} }
byDomain.keySeq().sortBy(domain => getPriority(domain)) byDomain.keySeq().sortBy(domain => getPriority(domain))

View File

@ -30,7 +30,7 @@ export default new Polymer({
serviceClicked(ev) { serviceClicked(ev) {
ev.preventDefault(); ev.preventDefault();
this.fire( this.fire(
'service-selected', {domain: ev.model.domain, 'service-selected', { domain: ev.model.domain,
service: ev.model.service}); service: ev.model.service });
}, },
}); });

View File

@ -70,12 +70,12 @@ export default new Polymer({
titlePosition: 'none', titlePosition: 'none',
vAxes: { vAxes: {
// Adds units to the left hand side of the graph // Adds units to the left hand side of the graph
0: {title: unit}, 0: { title: unit },
}, },
hAxis: { hAxis: {
format: 'H:mm', format: 'H:mm',
}, },
chartArea: { left: '60', width: '95%'}, chartArea: { left: '60', width: '95%' },
explorer: { explorer: {
actions: ['dragToZoom', 'rightClickToReset', 'dragToPan'], actions: ['dragToZoom', 'rightClickToReset', 'dragToPan'],
keepInBounds: true, keepInBounds: true,

View File

@ -44,7 +44,7 @@ export default new Polymer({
computeGroupedStateHistory(isLoading, stateHistory) { computeGroupedStateHistory(isLoading, stateHistory) {
if (isLoading || !stateHistory) { if (isLoading || !stateHistory) {
return {line: [], timeline: []}; return { line: [], timeline: [] };
} }
const lineChartDevices = {}; const lineChartDevices = {};
@ -75,7 +75,7 @@ export default new Polymer({
const unitStates = Object.keys(lineChartDevices).map( const unitStates = Object.keys(lineChartDevices).map(
(unit) => [unit, lineChartDevices[unit]]); (unit) => [unit, lineChartDevices[unit]]);
return {line: unitStates, timeline: timelineDevices}; return { line: unitStates, timeline: timelineDevices };
}, },
googleApiLoaded() { googleApiLoaded() {

View File

@ -91,9 +91,10 @@ export default new Polymer({
navigator.serviceWorker.register('./service_worker.js').catch(err => { navigator.serviceWorker.register('./service_worker.js').catch(err => {
if (__DEV__) { if (__DEV__) {
/* eslint-disable no-console */
console.warn('Unable to register service worker', err); console.warn('Unable to register service worker', err);
/* eslint-enable no-console */
} }
}); });
}, },
}); });

View File

@ -47,7 +47,7 @@ export default new Polymer({
}, },
listeners: { listeners: {
'keydown': 'passwordKeyDown', keydown: 'passwordKeyDown',
'loginButton.tap': 'validatePassword', 'loginButton.tap': 'validatePassword',
}, },

View File

@ -37,6 +37,7 @@ export default new Polymer({
template: { template: {
type: String, type: String,
/* eslint-disable max-len */
value: '{%- if is_state("device_tracker.paulus", "home") and \n' + value: '{%- if is_state("device_tracker.paulus", "home") and \n' +
' is_state("device_tracker.anne_therese", "home") -%}\n' + ' is_state("device_tracker.anne_therese", "home") -%}\n' +
'\n' + '\n' +
@ -55,6 +56,7 @@ export default new Polymer({
' {%- if loop.first %}The {% elif loop.last %} and the {% else %}, the {% endif -%}\n' + ' {%- if loop.first %}The {% elif loop.last %} and the {% else %}, the {% endif -%}\n' +
' {{ state.name | lower }} is {{state.state}} {{- state.attributes.unit_of_measurement}}\n' + ' {{ state.name | lower }} is {{state.state}} {{- state.attributes.unit_of_measurement}}\n' +
'{%- endfor -%}.', '{%- endfor -%}.',
/* eslint-enable max-len */
observer: 'templateChanged', observer: 'templateChanged',
}, },

View File

@ -7,13 +7,13 @@ const { serviceActions } = hass;
export default new Polymer({ export default new Polymer({
is: 'more-info-alarm_control_panel', is: 'more-info-alarm_control_panel',
handleDisarmTap() { handleDisarmTap() {
this.callService('alarm_disarm', {code: this.enteredCode}); this.callService('alarm_disarm', { code: this.enteredCode });
}, },
handleHomeTap() { handleHomeTap() {
this.callService('alarm_arm_home', {code: this.enteredCode}); this.callService('alarm_arm_home', { code: this.enteredCode });
}, },
handleAwayTap() { handleAwayTap() {
this.callService('alarm_arm_away', {code: this.enteredCode}); this.callService('alarm_arm_away', { code: this.enteredCode });
}, },
properties: { properties: {
stateObj: { stateObj: {

View File

@ -25,16 +25,16 @@ export default new Polymer({
onMoveUpTap() { onMoveUpTap() {
serviceActions.callService('rollershutter', 'move_up', serviceActions.callService('rollershutter', 'move_up',
{entity_id: this.stateObj.entityId}); { entity_id: this.stateObj.entityId });
}, },
onMoveDownTap() { onMoveDownTap() {
serviceActions.callService('rollershutter', 'move_down', serviceActions.callService('rollershutter', 'move_down',
{entity_id: this.stateObj.entityId}); { entity_id: this.stateObj.entityId });
}, },
onStopTap() { onStopTap() {
serviceActions.callService('rollershutter', 'stop', serviceActions.callService('rollershutter', 'stop',
{entity_id: this.stateObj.entityId}); { entity_id: this.stateObj.entityId });
}, },
}); });

View File

@ -16,7 +16,7 @@ export default new Polymer({
}, },
listeners: { listeners: {
'tap': 'cardTapped', tap: 'cardTapped',
}, },
cardTapped(ev) { cardTapped(ev) {

View File

@ -2,78 +2,78 @@ import defaultIcon from './default-icon';
export default function domainIcon(domain, state) { export default function domainIcon(domain, state) {
switch (domain) { switch (domain) {
case 'alarm_control_panel': case 'alarm_control_panel':
return state && state === 'disarmed' ? 'mdi:bell-outline' : 'mdi:bell'; return state && state === 'disarmed' ? 'mdi:bell-outline' : 'mdi:bell';
case 'binary_sensor': case 'binary_sensor':
return state && state === 'off' ? 'mdi:radiobox-blank' : 'mdi:checkbox-marked-circle'; return state && state === 'off' ? 'mdi:radiobox-blank' : 'mdi:checkbox-marked-circle';
case 'camera': case 'camera':
return 'mdi:video'; return 'mdi:video';
case 'configurator': case 'configurator':
return 'mdi:settings'; return 'mdi:settings';
case 'conversation': case 'conversation':
return 'mdi:text-to-speech'; return 'mdi:text-to-speech';
case 'device_tracker': case 'device_tracker':
return 'mdi:account'; return 'mdi:account';
case 'group': case 'group':
return 'mdi:google-circles-communities'; return 'mdi:google-circles-communities';
case 'homeassistant': case 'homeassistant':
return 'mdi:home'; return 'mdi:home';
case 'light': case 'light':
return 'mdi:lightbulb'; return 'mdi:lightbulb';
case 'lock': case 'lock':
return state && state === 'unlocked' ? 'mdi:lock-open' : 'mdi:lock'; return state && state === 'unlocked' ? 'mdi:lock-open' : 'mdi:lock';
case 'media_player': case 'media_player':
let icon = 'mdi:cast'; let icon = 'mdi:cast';
if (state && state !== 'off' && state !== 'idle') { if (state && state !== 'off' && state !== 'idle') {
icon += '-connected'; icon += '-connected';
} }
return icon; return icon;
case 'notify': case 'notify':
return 'mdi:comment-alert'; return 'mdi:comment-alert';
case 'updater': case 'updater':
return 'mdi:cloud-upload'; return 'mdi:cloud-upload';
case 'rollershutter': case 'rollershutter':
return state && state === 'open' ? 'mdi:window-open' : 'mdi:window-closed'; return state && state === 'open' ? 'mdi:window-open' : 'mdi:window-closed';
case 'scene': case 'scene':
return 'mdi:google-pages'; return 'mdi:google-pages';
case 'script': case 'script':
return 'mdi:file-document'; return 'mdi:file-document';
case 'sensor': case 'sensor':
return 'mdi:eye'; return 'mdi:eye';
case 'simple_alarm': case 'simple_alarm':
return 'mdi:bell'; return 'mdi:bell';
case 'sun': case 'sun':
return 'mdi:white-balance-sunny'; return 'mdi:white-balance-sunny';
case 'switch': case 'switch':
return 'mdi:flash'; return 'mdi:flash';
case 'thermostat': case 'thermostat':
return 'mdi:nest-thermostat'; return 'mdi:nest-thermostat';
default: default:
/* eslint-disable no-console */ /* eslint-disable no-console */
console.warn(`Unable to find icon for domain ${domain} (${state})`); console.warn(`Unable to find icon for domain ${domain} (${state})`);
/* eslint-enable no-console */ /* eslint-enable no-console */
return defaultIcon; return defaultIcon;
} }
} }

View File

@ -2,7 +2,7 @@ import hass from '../util/home-assistant-js-instance';
const { authActions, localStoragePreferences } = hass; const { authActions, localStoragePreferences } = hass;
export default function(authToken, rememberAuth) { export default function (authToken, rememberAuth) {
authActions.validate(authToken, { authActions.validate(authToken, {
rememberAuth, rememberAuth,
useStreaming: localStoragePreferences.useStreaming, useStreaming: localStoragePreferences.useStreaming,