From e4febbb59c513facceb5a474e4386542da01c2c6 Mon Sep 17 00:00:00 2001 From: "Uemit Seren @ Laptop" Date: Thu, 25 May 2017 16:00:54 +0200 Subject: [PATCH] Release of version 1.1.0 Upgraded Polymer dependency to 1.9. --- .eslintrc.json | 18 ++++++ .gitignore | 2 +- .travis.yml | 21 +++---- README.md | 26 ++++++--- bower.json | 8 ++- demo/index.html | 139 +++++++++++++++++++++++--------------------- polymer.json | 7 +++ test/.eslintrc.json | 13 +++++ timeu-wizard.html | 31 +++++----- wct.conf.json | 21 ------- 10 files changed, 160 insertions(+), 126 deletions(-) create mode 100644 .eslintrc.json create mode 100644 polymer.json create mode 100644 test/.eslintrc.json delete mode 100644 wct.conf.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..cc13518 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": "eslint:recommended", + "rules": { + "no-console": 0 + }, + "env": { + "browser": true + }, + "plugins": [ + "html" + ], + "globals": { + "CustomElements": false, + "HTMLImports": false, + "Polymer": false, + "WeakMap": false + } +} diff --git a/.gitignore b/.gitignore index f5a7e55..065ae23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ bower_components -.yo-rc.json \ No newline at end of file +.vscode \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 75ac1d8..cc8e0b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,22 @@ language: node_js sudo: required -node_js: stable -dist: trusty +before_script: + - npm install -g bower polylint web-component-tester eslint eslint-plugin-html + - bower install + - polylint + - eslint *.html test/*.html +node_js: '6' addons: firefox: latest apt: sources: - - google-chrome + - google-chrome packages: - - google-chrome-stable -before_script: - - npm install -g bower polylint web-component-tester - - bower install - - polylint + - google-chrome-stable script: - - xvfb-run wct --skip-plugin sauce - - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --skip-plugin local; fi + - xvfb-run wct + - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s ''default''; fi' +dist: trusty env: global: - secure: QrF9OBBaC4NMJy5YoHzlldFlSnwTjEJtTEC/5DgLf7KD+p5K6rY6224bOWwE5UPsPnkNkKGCl8rJ+P/CHqSqH8/2+zMnDrSI+owvZiYxXMdCpencnn2m2F3p2VDmYdVXlKRxXjWO/DyKOjGf3Zf12LB9I/tVEG2RwF9FTpZEzmSZXiiHyZfjY2/I5Ib0MGhNudunrp9OprrOJAliumvOhNYJzFhFSzSfzgpoo+vVFpv+K5WhlhkZ0WoctRWZQ4EUGLOo/ifpSNOFs2weHRL7di15w4blGiA7jGfKk4i+jEAQVQUV0XeDjkhX6LCnKUIkTJr9UzDjsffe/nJrusmQw8gD4SwlTTWjNtWiiKyRezjlMzq/nAvGIEzVjVrWDouznfNt/3tVQLSOXoqzJIrDWeLp3fwtdOUDGPcrp8CkHUxLEqkwtON8Xny5FG0bl5uqt88yfhmetscx512PQjZH/+aTrKJwrYz06i30qB8B//5PfN0/amrE/n/4ewWbYqmsjVfc9zBlDc0tNbJ7z3db7KxtjBPc3BHq3QrvfFxowlGmqTNVRur3MwD2wVmOo7GtyTy8/ZFT7f0hw8W49fML1BPreY25lzQf2lqR5J+XYtbyTt6H3GTUmWIoq0CfmFzTXToIVZkR2ETqDZXzxDKU+QU4Pf+veS6SkWCjjM/9ZMY= diff --git a/README.md b/README.md index 0a874a8..30dc980 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,27 @@ -[![Build Status](https://travis-ci.org/timeu/timeu-wizard.svg)](https://travis-ci.org/timeu/timeu-wizard) +[![Build Status](https://travis-ci.org/timeu/timeu-wizard.svg)](https://travis-ci.org/timeu/timeu-wizard) [![Published on webcomponents.org](https://img.shields.io/badge/webcomponents.org-published-blue.svg)](https://www.webcomponents.org/element/timeu/timeu-wizard) -_[Demo and API Docs](https://timeu.github.io/timeu-wizard/)_ +_[Demo and API Docs](https://www.webcomponents.org/element/timeu/canvas-piechart)_ ## <timeu-wizard> - -The `timeu-wizard` element displaying the progress of a wizard as a series of connected circles. -By default the step number is displayed inside the circle and if provided a label below. +The `timeu-wizard` element displaying the progress of a wizard as a series of connected circles. +By default the step number is displayed inside the circle and if provided a label below. The available steps are provided by either as an `array` of `Objects` or an `array` of `Strings`. + +**This branch (master) works only with Polymer 2.x. For a Polymer 1.x version check out the 1.x branch** + +## Versions (Polymer 2.x vs Polymer 1.x) +The *master* branch and all *2.x.x* releases require `Polymer 2.x`. +For `Polymer 1.x` support use *1.x.x* releases and the [1.x branch](https://github.com/timeu/timeu-wizard/tree/1.x). + +## How to use + Simple example: - + @@ -35,9 +43,9 @@ Example with custom circle content: ```html ``` -It is also possible to display a vertical progress by adding the `vertical` attribute: +It is also possible to display a vertical progress by adding the `vertical` attribute: ```html - + ``` ### Styling diff --git a/bower.json b/bower.json index c68a8b1..d6bc1f0 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "timeu-wizard", - "version": "1.0.1", + "version": "1.1.0", "authors": [ "Uemit Seren " ], @@ -19,10 +19,12 @@ "/test/" ], "dependencies": { - "polymer": "Polymer/polymer#^1.2.0" + "polymer": "Polymer/polymer#^1.9.0" }, "devDependencies": { "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", - "web-component-tester": "^3.4.0" + "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0", + "web-component-tester": "Polymer/web-component-tester#^6.0.0", + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" } } \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index f9d2206..1d352e7 100644 --- a/demo/index.html +++ b/demo/index.html @@ -9,49 +9,55 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt --> - - - - timeu-wizard Demo - - - - - - - -