From 8af02fb46beb92e4526bf4f19b32a01c4a4fc090 Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:20:19 +0200 Subject: [PATCH 01/10] update demo --- demo/index.html | 100 +++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 60 deletions(-) diff --git a/demo/index.html b/demo/index.html index d57f5e1..6327181 100644 --- a/demo/index.html +++ b/demo/index.html @@ -1,68 +1,48 @@ - + - - flip-clock Demo + + + + flip-clock demo + + + + - + + + + -
-

Clock

- <flip-clock></flip-clock> - - -

Timer

- <flip-clock display-mode="timer" show-buttons></flip-clock> - - -

Countdown

- <flip-clock display-mode="countdown" start-from="20" show-buttons></flip-clock> - - -

Countdown without hours

- <flip-clock display-mode="countdown" start-from="20" show-buttons hide-hours></flip-clock> - -
+
+

Basic flip-clock

+ + + +

Timer flip-clock

+ + + +

Countdown flip-clock

+ + + +

Countdown without hours flip-clock

+ + + +
From 91f8bc75d8a7f7a166dfb59ae803affd4557a3a7 Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:21:06 +0200 Subject: [PATCH 02/10] update deps version --- bower.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 78cb64a..d312a29 100644 --- a/bower.json +++ b/bower.json @@ -1,19 +1,22 @@ { "name": "flip-clock", - "version": "1.2.5", + "version": "2.0.0", "keywords": [ "polymer", "web-components" ], "main": "flip-clock.html", "dependencies": { - "moment": "~2.13.0", - "polymer": "Polymer/polymer#^1.4.0" + "polymer": "Polymer/polymer#^2.0.0", + "moment": "^2.18.1" }, "devDependencies": { - "test-fixture": "polymerelements/test-fixture#^1.1.0", - "iron-test-helpers": "polymerelements/iron-test-helpers#~1.2.3", - "iron-component-page": "polymerelements/iron-component-page#~1.1.2" + "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0", + "web-component-tester": "Polymer/web-component-tester#^6.0.0", + "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0" + }, + "resolutions": { + "polymer": "^2.0.0" }, "homepage": "https://github.com/Granze/flip-clock", "authors": [ From b622fbca9ee6fd099a6170dd337c9e4dbaba2214 Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:21:36 +0200 Subject: [PATCH 03/10] update to Polymer 2 --- flip-clock.html | 362 ++++++++++++++++++------------------------------ 1 file changed, 134 insertions(+), 228 deletions(-) diff --git a/flip-clock.html b/flip-clock.html index 9aa82ee..cdcd6b1 100644 --- a/flip-clock.html +++ b/flip-clock.html @@ -1,71 +1,53 @@ - + - - - - - - + + window.customElements.define(FlipClock.is, FlipClock); + + From 6f5c9a51c3dc7b6efc3db50ad1481be22e6059ea Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:22:06 +0200 Subject: [PATCH 04/10] update entry page for demo --- index.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 6e210fe..75002ba 100644 --- a/index.html +++ b/index.html @@ -1,15 +1,16 @@ - - - - - + + + flip-clock - - - + From 9ba3bc193f68d76b0841b16b48dee0de3f3a6e5b Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:22:18 +0200 Subject: [PATCH 05/10] add lint rules --- polymer.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 polymer.json diff --git a/polymer.json b/polymer.json new file mode 100644 index 0000000..2bd10b6 --- /dev/null +++ b/polymer.json @@ -0,0 +1,7 @@ +{ + "lint": { + "rules": [ + "polymer-2" + ] + } +} From 3404d871ea2fa6679eada32d6262e610e09b831d Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:22:55 +0200 Subject: [PATCH 06/10] remove index --- test/index.html | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 test/index.html diff --git a/test/index.html b/test/index.html deleted file mode 100644 index a3fa1f7..0000000 --- a/test/index.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Tests - - - - - - - - - From 0a9c99d3afac18c0e2e5df62cf616c445302e71a Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:23:09 +0200 Subject: [PATCH 07/10] [WIP] update deps --- test/flip-clock-test.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/flip-clock-test.html b/test/flip-clock-test.html index fd6faec..85a0492 100644 --- a/test/flip-clock-test.html +++ b/test/flip-clock-test.html @@ -3,10 +3,8 @@ - + - - From 595dc34bdc5eef8b6a54497ada0ba03f299f7376 Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Wed, 26 Jul 2017 23:46:31 +0200 Subject: [PATCH 08/10] increase max-with to fit the element --- demo/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/demo/index.html b/demo/index.html index 6327181..93ca0cf 100644 --- a/demo/index.html +++ b/demo/index.html @@ -16,6 +16,11 @@ +
From 32b8663754d676c6f6486ace8a01248af46d4fa9 Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Thu, 27 Jul 2017 10:58:08 +0200 Subject: [PATCH 09/10] test refactor --- test/flip-clock-test.html | 54 ++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/test/flip-clock-test.html b/test/flip-clock-test.html index 85a0492..32a9011 100644 --- a/test/flip-clock-test.html +++ b/test/flip-clock-test.html @@ -7,7 +7,6 @@ - @@ -31,47 +30,44 @@ From d3788315cd1a00558e3a1cd06c03d7cd9ced371b Mon Sep 17 00:00:00 2001 From: Maurizio Mangione Date: Thu, 27 Jul 2017 11:24:22 +0200 Subject: [PATCH 10/10] update travis configuration --- .travis.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index d85bdcf..fa0831f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,16 @@ language: node_js -node_js: - - '4.0.0' - - '5.0.0' +node_js: stable +dist: trusty +sudo: required addons: firefox: latest -before_install: - - 'npm install -g bower web-component-tester' - - 'bower install' - - 'export DISPLAY=:99.0' - - 'sh -e /etc/init.d/xvfb start' -script: 'wct' + apt: + sources: + - google-chrome + packages: + - google-chrome-stable +before_script: +- npm install -g bower polylint web-component-tester +- bower install +- polylint +script: xvfb-run wct