summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeemu Pöntelin <tehapo@gmail.com>2016-09-12 15:42:25 +0300
committerGitHub <noreply@github.com>2016-09-12 15:42:25 +0300
commitef511503883617447331b26a8cd84e7cbb214877 (patch)
tree14f78f65eddbd17351493bcfa5ce5d38a4788e4f
parentaa81d059616e1b31b7d6df92d7fe7da0327c6b41 (diff)
parent979a3006ebed0bac40b115541d1a0122b136eda1 (diff)
downloadvaadin-core-ef511503883617447331b26a8cd84e7cbb214877.tar.gz
vaadin-core-ef511503883617447331b26a8cd84e7cbb214877.zip
Merge pull request #70 from vaadin/add-context-menu
Add context menu to master deploys
-rw-r--r--README.md17
-rw-r--r--bower.json7
-rw-r--r--index.html3
-rw-r--r--tasks/cdn.js4
4 files changed, 19 insertions, 12 deletions
diff --git a/README.md b/README.md
index 86209e3..5fe86ac 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,9 @@ Individual elements of the Core Elements bundle are released separately, and you
#### Nearly there
- [`<vaadin-grid>`](https://github.com/vaadin/vaadin-grid) 1.2
- [`<vaadin-split-layout>`](https://github.com/vaadin/vaadin-split-panel) 0.1
+- [`<vaadin-context-menu>`](https://github.com/vaadin/vaadin-context-menu) 0.1
-#### Next up
+#### Next up
- [`<vaadin-combo-box>`](https://github.com/vaadin/vaadin-combo-box) 1.x
- Custom filtering
- Lazy loading
@@ -86,23 +87,23 @@ The following instructions are common for all Vaadin core elements. **Replace `v
### Getting the code
1. Clone the element project from GitHub:
-
+
```shell
$ git clone https://github.com/vaadin/vaadin-combo-box.git
```
2. Install [Node](https://nodejs.org/en/download/). It comes bundled with [npm](https://npmjs.com), which is needed to install other tooling.
-3. Install [Bower](http://bower.io) using [npm](https://npmjs.com):
-
+3. Install [Bower](http://bower.io) using [npm](https://npmjs.com):
+
```shell
$ npm install -g bower
```
-
+
> If you encounter permission issues when running `npm` see the article about [fixing npm permissions](https://docs.npmjs.com/getting-started/fixing-npm-permissions) on npmjs.com
4. Use Bower to install the dependencies of the element:
-
+
```shell
$ cd vaadin-combo-box
$ bower install
@@ -111,13 +112,13 @@ The following instructions are common for all Vaadin core elements. **Replace `v
### Running demos
1. Install [polyserve](https://github.com/PolymerLabs/polyserve) using [npm](https://npmjs.com):
-
+
```shell
$ npm install -g polyserve
```
2. Start a local server in the project root directory:
-
+
```shell
$ cd vaadin-combo-box
$ polyserve
diff --git a/bower.json b/bower.json
index 9534c9b..caa1c1d 100644
--- a/bower.json
+++ b/bower.json
@@ -39,7 +39,9 @@
"components-demo-resources": "vaadin/components-demo-resources#master",
"mock-http-request": "philikon/MockHttpRequest#master",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
- "paper-toast": "polymerelements/paper-toast#^1.0.0"
+ "paper-toast": "polymerelements/paper-toast#^1.0.0",
+ "paper-menu": "^1.2.2",
+ "paper-item": "^1.2.1"
},
"resolutions": {
"polymer": "v1.1.1"
@@ -52,7 +54,8 @@
"vaadin-icons": "vaadin/vaadin-icons#master",
"vaadin-date-picker": "vaadin/vaadin-date-picker#master",
"vaadin-upload": "vaadin/vaadin-upload#master",
- "vaadin-split-layout": "vaadin/vaadin-split-layout#master"
+ "vaadin-split-layout": "vaadin/vaadin-split-layout#master",
+ "vaadin-context-menu": "vaadin/vaadin-context-menu#master"
}
}
}
diff --git a/index.html b/index.html
index 14ddb06..0109d2b 100644
--- a/index.html
+++ b/index.html
@@ -80,6 +80,9 @@ This program is available under Apache License Version 2.0, available at https:/
<li>
<a href="../vaadin-split-layout/">Vaadin<br> SplitLayout</a>
<a href="../vaadin-split-layout/demo/">Demo</a>
+ <li>
+ <a href="../vaadin-context-menu/">Vaadin<br> ContextMenu</a>
+ <a href="../vaadin-context-menu/demo/">Demo</a>
<li>
<a href="../vaadin-icons/">Vaadin<br> Icons</a>
<a href="../vaadin-icons/demo/">Demo</a>
diff --git a/tasks/cdn.js b/tasks/cdn.js
index d1c1882..a2bb3a7 100644
--- a/tasks/cdn.js
+++ b/tasks/cdn.js
@@ -33,8 +33,8 @@ gulp.task('cdn:stage-bower.json', ['clean:cdn'], function() {
delete bowerJson.masterOverrides;
}
- fs.mkdirSync(stagingBasePath);
- fs.mkdirSync(stagingPath);
+ fs.mkdirsSync(stagingBasePath);
+ fs.mkdirsSync(stagingPath);
fs.writeFileSync(stagingPath + '/bower.json', JSON.stringify(bowerJson, null, ' '));
});