diff options
-rw-r--r-- | README.md | 38 | ||||
-rw-r--r-- | bower.json | 5 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | tasks/config.js | 2 | ||||
-rw-r--r-- | tasks/docsite.js | 6 | ||||
-rw-r--r-- | tasks/zip.js | 2 | ||||
-rw-r--r-- | vaadin-core-elements.html | 1 |
7 files changed, 31 insertions, 25 deletions
@@ -4,22 +4,14 @@ Vaadin Core Elements is an evolving set of custom HTML elements, built using [Polymer](https://www.polymer-project.org), for building mobile and desktop web applications in modern browsers. -### Component examples and documentation +### Examples and Documentation View live examples and source code side-by-side for individual custom elements. -======= | Element | Description | Status | --- | --- | --- | | [<**vaadin-grid**>](https://github.com/vaadin/vaadin-grid) · [Examples](https://cdn.vaadin.com/vaadin-core-elements/latest/vaadin-grid/demo/) · [API](https://cdn.vaadin.com/vaadin-core-elements/latest/vaadin-grid/) | Data grid for showing large amounts of tabular data. | Beta | - -### Quickstart - - Get a quick test-drive of the custom elements by forking one of the following JSFiddles: - -- <**vaadin-grid**> - - [Data generated on-the-fly](http://jsfiddle.net/jounik/tvk1235r/) - - [JSON data from a URL](http://jsfiddle.net/jounik/tLour4gv/) +| [<**vaadin-combo-box**>](https://github.com/vaadin/vaadin-combo-box) · [Examples](https://cdn.vaadin.com/vaadin-core-elements/master/vaadin-combo-box/demo/) · [API](https://cdn.vaadin.com/vaadin-core-elements/master/vaadin-combo-box/) | Filterable select element for a large set of items. | Alpha | ### Installation @@ -43,9 +35,9 @@ We offer three ways to use Vaadin Core Elements in your project: Bower, CDN and ``` This will download Vaadin Core Elements bundle and its dependencies to the `bower_components` folder inside your project's folder. - + If you wish to use the development snapshot version of some component, you can install/update that separately: - + ```shell $ bower install --save vaadin-grid#master ``` @@ -98,15 +90,27 @@ We offer three ways to use Vaadin Core Elements in your project: Bower, CDN and </head> <body> + <!-- Use the elements, for instance vaadin-grid --> <vaadin-grid selection-mode="multi"> <table> <!-- Define the columns --> - <col name="index" header-text="#" width="48"> + <col name="index" width="48"> <col name="user.picture.thumbnail" width="54"> - <col name="user.name.first" header-text="First Name"> - <col name="user.name.last" header-text="Last Name"> - <col name="user.email" header-text="Email" flex> + <col name="user.name.first"> + <col name="user.name.last"> + <col name="user.email" flex> </table> + + <!-- Define custom column headers --> + <thead> + <tr> + <th>#</th> + <th></th> + <th>First Name</th> + <th>Last Name</th> + <th>Email</th> + </tr> + </thead> </vaadin-grid> <script> @@ -114,6 +118,8 @@ We offer three ways to use Vaadin Core Elements in your project: Bower, CDN and // use to determine when the custom elements are ready to be used document.addEventListener("WebComponentsReady", function () { + // Configure vaadin-grid to show data + // Reference to the grid element var grid = document.querySelector("vaadin-grid"); @@ -5,7 +5,7 @@ "Vaadin Ltd" ], "description": "Vaadin Core Elements is an evolving set of free, open sourced custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.", - "license": "Apache License 2.0", + "license": "Apache-2.0", "keywords": [ "vaadin", "core", @@ -24,7 +24,8 @@ "**/tests" ], "dependencies": { - "vaadin-grid": "vaadin/vaadin-grid#~1.0.0" + "vaadin-grid": "vaadin/vaadin-grid#~1.0.0", + "vaadin-combo-box": "vaadin/vaadin-combo-box#1.0.0-alpha2" }, "devDependencies": { "iron-component-page": "polymerelements/iron-component-page#~1.1.0", diff --git a/package.json b/package.json index 6d84aca..d64af08 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.3.0", "description": "Vaadin Core Elements is an evolving set of free, open sourced custom HTML elements, built using Polymer, for building mobile and desktop web applications in modern browsers.", "author": "Vaadin Ltd", - "license": "Apache License 2.0", + "license": "Apache-2.0", "dependencies": { "bower": "latest", "fs-extra": "latest", diff --git a/tasks/config.js b/tasks/config.js index 96ab57f..89188df 100644 --- a/tasks/config.js +++ b/tasks/config.js @@ -4,7 +4,7 @@ var fs = require('fs'); var userhome = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE; module.exports = { - coreElements: ['vaadin-grid'], + coreElements: ['vaadin-grid', 'vaadin-combo-box'], version: args.version || 'master', permalink: args.version ? 'latest' : '', toolsHost: args.toolsHostname || 'tools.vaadin.com', diff --git a/tasks/docsite.js b/tasks/docsite.js index 8428cd4..46d2ac2 100644 --- a/tasks/docsite.js +++ b/tasks/docsite.js @@ -33,7 +33,7 @@ gulp.task('cdn:docsite:bower_components', ['cdn:stage-bower_components'], functi .pipe(modify({ fileModifier: function(file, contents) { if (/webcomponents-lite.*js/.test(file.path)) { - contents = contents.replace(/(if ?\()(\w+\.log)(\))/mg, '$1$2 && $2.split$3') + contents = contents.replace(/(if ?\()(\w+\.log)(\))/mg, '$1$2 && $2.split$3'); } return contents; } @@ -115,9 +115,7 @@ gulp.task('cdn:docsite:upload', ['cdn:docsite:clean', 'cdn:docsite:zip'], functi path: args.cdnDestination + version }, function(err) { done(err); - }) + }); }); gulp.task('cdn:docsite', ['cdn:docsite:upload']); - - diff --git a/tasks/zip.js b/tasks/zip.js index 5713b7e..f80d0aa 100644 --- a/tasks/zip.js +++ b/tasks/zip.js @@ -41,7 +41,7 @@ gulp.task('zip:upload', ['stage:zip'], function(done) { path: dst }, function(err) { done(err); - }) + }); }); gulp.task('zip:update-references', ['zip:upload'], function(done) { diff --git a/vaadin-core-elements.html b/vaadin-core-elements.html index 4e1e836..316b174 100644 --- a/vaadin-core-elements.html +++ b/vaadin-core-elements.html @@ -1 +1,2 @@ <link rel="import" href="../vaadin-grid/vaadin-grid.html"> +<link rel="import" href="../vaadin-combo-box/vaadin-combo-box.html"> |