Update versions

This commit is contained in:
Paulus Schoutsen 2016-07-11 22:07:17 -07:00
parent 99e82d6380
commit 6b226c02da
6 changed files with 14 additions and 13 deletions

View File

@ -8,12 +8,12 @@
"license": "MIT",
"private": true,
"devDependencies": {
"polymer": "Polymer/polymer#~1.4",
"polymer": "Polymer/polymer#~1.6",
"pikaday": "1.4",
"leaflet-map": "1.2.0",
"iron-elements": "PolymerElements/iron-elements#~1.0.9",
"iron-elements": "PolymerElements/iron-elements#~1.0.10",
"paper-elements": "PolymerElements/paper-elements#~1.0.7",
"google-apis": "GoogleWebComponents/google-apis#~1.1.4",
"google-apis": "GoogleWebComponents/google-apis#~1.1.6",
"font-roboto-local": "^1.0.1"
}
}

@ -1 +1 @@
Subproject commit b4f1c1a2cbfb2bb0ed641baf5a8e58dc025596a6
Subproject commit ec009a974262e2fa50c550fca6cd0bfada94ee56

View File

@ -21,17 +21,17 @@
"license": "MIT",
"dependencies": {
"classnames": "^2.2.5",
"moment": "^2.13.0"
"moment": "^2.14.1"
},
"devDependencies": {
"babel-core": "^6.9",
"babel-core": "^6.10",
"babel-loader": "^6.2",
"babel-preset-es2015-webpack": "^6.4.1",
"bower": "^1.7.9",
"eslint": "^2.12.0",
"eslint-config-airbnb-base": "^3.0.1",
"eslint-plugin-import": "^1.7.0",
"html-minifier": "^2.1.3",
"eslint": "^3.0.1",
"eslint-config-airbnb-base": "^4.0.0",
"eslint-plugin-import": "^1.10.2",
"html-minifier": "^3.0.1",
"sw-precache": "^3.2.0",
"vulcanize": "^1.14.8",
"webpack": "^2.1.0-beta.13"

View File

@ -49,7 +49,8 @@ export default new Polymer({
},
showGroupToggle(groupEntity, states) {
if (!groupEntity || !states || groupEntity.state !== 'on' && groupEntity.state !== 'off') {
if (!groupEntity || !states ||
(groupEntity.state !== 'on' && groupEntity.state !== 'off')) {
return false;
}

View File

@ -95,7 +95,7 @@ export default new Polymer({
});
chart.draw(dataTable, {
height: 55 + numTimelines * 42,
height: 55 + (numTimelines * 42),
timeline: {
showRowLabels: stateHistory.length > 1,

View File

@ -84,7 +84,7 @@ export default new Polymer({
this.windowChange = this.windowChange.bind(this);
const sizes = [];
for (let col = 0; col < 5; col++) {
sizes.push(300 + col * 300);
sizes.push(300 + (col * 300));
}
this.mqls = sizes.map(width => {
const mql = window.matchMedia(`(min-width: ${width}px)`);