Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polymer 2 prepare #309

Merged
merged 14 commits into from
Jun 18, 2017
59 changes: 47 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,58 @@
"license": "MIT",
"private": true,
"devDependencies": {
"app-layout": "~0.10.6",
"app-storage": "PolymerElements/app-storage#~0.9.8",
"app-layout": "^2.0.0",
"app-storage": "^2.0.2",
"fecha": "~2.3.0",
"font-roboto-local": "~1.0.1",
"google-apis": "GoogleWebComponents/google-apis#~1.1.6",
"iron-elements": "PolymerElements/iron-elements#~1.0.10",
"paper-elements": "PolymerElements/paper-elements#~1.0.7",
"paper-range-slider": "IftachSadeh/paper-range-slider#~0.2.4",
"paper-scroll-header-panel": "~1.0.16",
"polymer": "Polymer/polymer#~1.8.0",
"vaadin-combo-box": "vaadin/vaadin-combo-box#~1.1.5",
"vaadin-date-picker": "^1.2.1",
"paper-slider": "1.0.14",
"iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^2.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.0",
"iron-icon": "PolymerElements/iron-icon#^2.0.0",
"iron-image": "PolymerElements/iron-image#^2.1.1",
"iron-input": "PolymerElements/iron-input#^2.0.0",
"iron-media-query": "PolymerElements/iron-media-query#^2.0.0",
"iron-pages": "PolymerElements/iron-pages#^2.0.0",
"leaflet": "^1.0.2",
"polymer-sortablejs": "^0.1.3"
"neon-animation": "PolymerElements/neon-animation#^2.0.1",
"paper-button": "PolymerElements/paper-button#^2.0.0",
"paper-card": "PolymerElements/paper-card#^2.0.0",
"paper-checkbox": "PolymerElements/paper-checkbox#^2.0.0",
"paper-dialog": "PolymerElements/paper-dialog#^2.0.0",
"paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^2.1.0",
"paper-drawer-panel": "PolymerElements/paper-drawer-panel#^2.0.0",
"paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^2.0.0",
"paper-fab": "PolymerElements/paper-fab#^2.0.0",
"paper-icon-button": "PolymerElements/paper-icon-button#^2.0.0",
"paper-input": "PolymerElements/paper-input#^2.0.1",
"paper-item": "PolymerElements/paper-item#^2.0.0",
"paper-listbox": "PolymerElements/paper-listbox#^2.0.0",
"paper-material": "PolymerElements/paper-material#^2.0.0",
"paper-menu": "PolymerElements/paper-menu#^1.3.0",
"paper-menu-button": "PolymerElements/paper-menu-button#^2.0.0",
"paper-progress": "PolymerElements/paper-progress#^2.0.1",
"paper-radio-button": "PolymerElements/paper-radio-button#^2.0.0",
"paper-radio-group": "PolymerElements/paper-radio-group#^2.0.0",
"paper-scroll-header-panel": "~2.0.0",
"paper-slider": "PolymerElements/paper-slider#^2.0.1",
"paper-spinner": "PolymerElements/paper-spinner#^2.0.0",
"paper-styles": "PolymerElements/paper-styles#^2.0.0",
"paper-tabs": "PolymerElements/paper-tabs#^2.0.0",
"paper-toast": "PolymerElements/paper-toast#^2.0.0",
"paper-toggle-button": "PolymerElements/paper-toggle-button#^2.0.0",
"polymer": "Polymer/polymer#~1.9.2",
"polymer-sortablejs": "^0.1.3",
"vaadin-combo-box": "vaadin/vaadin-combo-box#v2.0.0-alpha4",
"vaadin-date-picker": "vaadin/vaadin-date-picker#v2.0.0-alpha1",
"web-animations-js": "^2.2.5"
},
"resolutions": {
"paper-slider": "1.0.14"
"polymer": "^1.0.0",
"webcomponentsjs": "^0.7.24",
"iron-flex-layout": "^2.0.0",
"paper-input": "^2.0.0",
"paper-styles": "2.0.0",
"iron-resizable-behavior": "^2.0.0",
"iron-a11y-keys-behavior": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion panels/automation/ha-automation-editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<paper-icon-button
icon='mdi:arrow-left'
Expand Down
2 changes: 1 addition & 1 deletion panels/automation/ha-automation-picker.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Automations Editor</div>
Expand Down
4 changes: 2 additions & 2 deletions panels/config/group/ha-form-group.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@
>
<paper-icon-button
icon='mdi:plus'
class="dropdown-trigger"
slot="dropdown-trigger"
></paper-icon-button>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{entityPollingIntensity}}'
>
<paper-item>Do not poll (0)</paper-item>
Expand Down
2 changes: 1 addition & 1 deletion panels/config/ha-entity-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
disabled='[[!entities.length]]'
>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedEntity}}'
>
<template is='dom-repeat' items='[[entities]]' as='state'>
Expand Down
2 changes: 1 addition & 1 deletion panels/config/ha-panel-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<iron-media-query query="(min-width: 1296px)" query-matches="{{wideSidebar}}">
</iron-media-query>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Configuration</div>
Expand Down
2 changes: 1 addition & 1 deletion panels/config/z-wave/ha-form-zwave-device.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
disabled='[[entityIgnored]]'
>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{entityPollingIntensity}}'
>
<paper-item>Do not poll (0)</paper-item>
Expand Down
2 changes: 1 addition & 1 deletion panels/dev-event/ha-panel-dev-event.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Events</div>
Expand Down
2 changes: 1 addition & 1 deletion panels/dev-info/ha-panel-dev-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>About</div>
Expand Down
3 changes: 2 additions & 1 deletion panels/dev-service/ha-panel-dev-service.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Services</div>
Expand Down Expand Up @@ -188,6 +188,7 @@ <h1>Valid Parameters</h1>
},

computeAttributesArray: function (serviceDomains, domain, service) {
if (!serviceDomains) return [];
if (!(domain in serviceDomains)) return [];
if (!(service in serviceDomains[domain])) return [];

Expand Down
2 changes: 1 addition & 1 deletion panels/dev-state/ha-panel-dev-state.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>States</div>
Expand Down
2 changes: 1 addition & 1 deletion panels/dev-template/ha-panel-dev-template.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</style>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Templates</div>
Expand Down
2 changes: 1 addition & 1 deletion panels/hassio/addon-store/hassio-addon-store.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
</style>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<paper-icon-button
icon='mdi:arrow-left'
Expand Down
2 changes: 1 addition & 1 deletion panels/hassio/addon-view/hassio-addon-view.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}
</style>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<paper-icon-button
icon='mdi:arrow-left'
Expand Down
2 changes: 1 addition & 1 deletion panels/hassio/dashboard/hassio-dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
</style>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Hass.io</div>
Expand Down
2 changes: 1 addition & 1 deletion panels/hassio/supervisor/hassio-supervisor.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
</style>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<paper-icon-button
icon='mdi:arrow-left'
Expand Down
10 changes: 8 additions & 2 deletions panels/history/ha-panel-history.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
}

vaadin-date-picker {
--vaadin-date-picker-clear-icon: {
display: none;
}
margin-bottom: 24px;
margin-right: 16px;
max-width: 200px;
Expand All @@ -42,7 +45,7 @@
is-loading='{{isLoadingData}}'
></ha-state-history-data>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>History</div>
Expand All @@ -63,7 +66,10 @@
label='Period'
disabled='[[isLoadingData]]'
>
<paper-menu class="dropdown-content" selected="{{_periodIndex}}">
<paper-menu
slot="dropdown-content"
selected="{{_periodIndex}}"
>
<paper-item>1 day</paper-item>
<paper-item>3 days</paper-item>
<paper-item>1 week</paper-item>
Expand Down
5 changes: 4 additions & 1 deletion panels/logbook/ha-panel-logbook.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
}

vaadin-date-picker {
--vaadin-date-picker-clear-icon: {
display: none;
}
margin-bottom: 24px;
max-width: 200px;
}
Expand All @@ -47,7 +50,7 @@
></ha-logbook-data>

<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Logbook</div>
Expand Down
6 changes: 3 additions & 3 deletions panels/zwave/ha-panel-zwave.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}
</style>
<app-header-layout has-scrolling-region>
<app-header fixed>
<app-header slot="header" fixed>
<app-toolbar>
<ha-menu-button narrow='[[narrow]]' show-menu='[[showMenu]]'></ha-menu-button>
<div main-title>Z-Wave Manager</div>
Expand All @@ -73,7 +73,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Nodes" class="flex">
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedNode}}'>
<template is='dom-repeat' items='[[nodes]]' as='state'>
<paper-item>[[computeSelectCaption(state)]]</paper-item>
Expand Down Expand Up @@ -127,7 +127,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Entities of this node" class="flex">
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedEntity}}'>
<template is='dom-repeat' items='[[entities]]' as='state'>
<paper-item>[[computeSelectCaptionEnt(state)]]</paper-item>
Expand Down
4 changes: 2 additions & 2 deletions panels/zwave/zwave-groups.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Node to control" class='flex'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedTargetNode}}'>
<template is='dom-repeat' items='[[nodes]]' as='state'>
<paper-item>[[computeSelectCaption(state)]]</paper-item>
Expand All @@ -50,7 +50,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Group" class='flex'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedGroup}}'>
<template is='dom-repeat' items='[[groups]]' as='state'>
<paper-item>[[computeSelectCaptionGroup(state)]]</paper-item>
Expand Down
6 changes: 3 additions & 3 deletions panels/zwave/zwave-node-config.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Config parameter" class='flex'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedConfigParameter}}'>
<template is='dom-repeat' items='[[config]]' as='state'>
<paper-item>[[computeSelectCaptionConfigParameter(state)]]</paper-item>
Expand All @@ -67,7 +67,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Config value" class='flex' placeholder='{{loadedConfigValue}}'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedConfigValue}}'>
<template is='dom-repeat' items='[[selectedConfigParameterValues]]' as='state'>
<paper-item>[[state]]</paper-item>
Expand All @@ -92,7 +92,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Config value" class='flex' placeholder='{{loadedConfigValue}}'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedConfigValue}}'>
<template is='dom-repeat' items='[[selectedConfigParameterValues]]' as='state'>
<paper-item>[[state]]</paper-item>
Expand Down
2 changes: 1 addition & 1 deletion panels/zwave/zwave-usercodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Code slot" class='flex'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedUserCode}}'>
<template is='dom-repeat' items='[[userCodes]]' as='state'>
<paper-item>[[computeSelectCaptionUserCodes(state)]]</paper-item>
Expand Down
2 changes: 1 addition & 1 deletion panels/zwave/zwave-values.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class='device-picker'>
<paper-dropdown-menu label="Value" class='flex'>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected='{{selectedValue}}'>
<template is='dom-repeat' items='[[values]]' as='item'>
<paper-item>[[computeSelectCaption(item)]]</paper-item>
Expand Down
6 changes: 3 additions & 3 deletions preact-src/script/script_action.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export default class Action extends Component {
<div>
<paper-dropdown-menu-light label="Action Type" no-animations>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected={selected}
oniron-select={this.typeChanged}
>
Expand Down Expand Up @@ -90,9 +90,9 @@ export default class Action extends Component {
>
<paper-icon-button
icon="mdi:dots-vertical"
class="dropdown-trigger"
slot="dropdown-trigger"
/>
<paper-menu class="dropdown-content">
<paper-menu slot="dropdown-content">
<paper-item disabled>Duplicate</paper-item>
<paper-item onTap={this.onDelete}>Delete</paper-item>
</paper-menu>
Expand Down
6 changes: 3 additions & 3 deletions preact-src/trigger/trigger_row.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class TriggerRow extends Component {
<div>
<paper-dropdown-menu-light label="Trigger Type" no-animations>
<paper-listbox
class="dropdown-content"
slot="dropdown-content"
selected={selected}
oniron-select={this.typeChanged}
>
Expand Down Expand Up @@ -88,9 +88,9 @@ export default class TriggerRow extends Component {
>
<paper-icon-button
icon="mdi:dots-vertical"
class="dropdown-trigger"
slot="dropdown-trigger"
/>
<paper-menu class="dropdown-content">
<paper-menu slot="dropdown-content">
<paper-item disabled>Duplicate</paper-item>
<paper-item onTap={this.onDelete}>Delete</paper-item>
</paper-menu>
Expand Down