Merge pull request #215 from vaadin/new-demos

Adapt demos to new vaadin site

.eslintrc.json

@@ -2,7 +2,8 @@
   "extends": "vaadin",
   "env": {
     "browser": true,
-    "node": true
+    "node": true,
+    "es6": true
   },
   "plugins": [
     "html"

.travis.yml

@@ -19,12 +19,11 @@ before_install:
 
 install:
   - npm install
-  - polymer install --variants
+  - polymer install
 
 before_script:
   - gulp lint
   - polymer lint --rules polymer-2-hybrid --input *.html
-  - xvfb-run -s '-screen 0 1024x768x24' polymer test
 
 script:
   - if [[ "$TRAVIS_EVENT_TYPE" != "pull_request" && "$TRAVIS_BRANCH" != quick/* ]]; then

bower.json

@@ -35,18 +35,19 @@
     "paper-icon-button": "PolymerElements/paper-icon-button#1 - 2",
     "paper-progress": "PolymerElements/paper-progress#1 - 2",
     "paper-ripple": "PolymerElements/paper-ripple#1 - 2",
-    "paper-styles": "PolymerElements/paper-styles#1 - 2"
+    "paper-styles": "PolymerElements/paper-styles#1 - 2",
+    "vaadin-themable-mixin": "^1.1.0"
   },
   "devDependencies": {
-    "elements-demo-resources": "vaadin/elements-demo-resources#^2.0.0",
     "iron-component-page": "PolymerElements/iron-component-page#1 - 2",
     "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
     "iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2",
-    "mock-http-request": "philikon/MockHttpRequest#master",
+    "mock-http-request": "abuinitski/MockHttpRequest#npm_fix",
     "paper-toast": "PolymerElements/paper-toast#1 - 2",
     "test-fixture": "PolymerElements/test-fixture#^3.0.0",
     "web-component-tester": "Polymer/web-component-tester#^6.1.5",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0"
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
+    "vaadin-demo-helpers": "vaadin/vaadin-demo-helpers"
   },
   "variants": {
     "1.x": {
@@ -65,7 +66,7 @@
         "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
         "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^2.0.0",
         "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-        "mock-http-request": "philikon/MockHttpRequest#master",
+        "mock-http-request": "abuinitski/MockHttpRequest#npm_fix",
         "paper-toast": "PolymerElements/paper-toast#^1.0.0",
         "test-fixture": "PolymerElements/test-fixture#^1.0.0",
         "web-component-tester": "Polymer/web-component-tester#^4.0.0",

demo/.eslintrc.json

@@ -3,6 +3,8 @@
     "no-console": 0
   },
   "globals": {
+    "UploadDemo": false,
+    "DemoReadyEventEmitter":false,
     "MockHttpRequest": false
   }
 }

demo/demos.json

@@ -0,0 +1,37 @@
+{
+  "name": "Vaadin Upload",
+  "pages": [
+  {
+    "name": "Basic Examples",
+    "url": "upload-basic-demos",
+    "src": "upload-basic-demos.html",
+    "meta": {
+      "title": "vaadin-upload Basic Examples",
+      "description": "",
+      "image": ""
+     }
+  }
+  ,
+  {
+    "name": "Advanced Usage",
+    "url": "upload-advanced-demos",
+    "src": "upload-advanced-demos.html",
+    "meta": {
+      "title": "vaadin-upload Advanced Examples",
+      "description": "",
+      "image": ""
+     }
+  }
+  ,
+  {
+    "name": "I18N",
+    "url": "upload-i18n-demos",
+    "src": "upload-i18n-demos.html",
+    "meta": {
+      "title": "vaadin-upload I18n Examples",
+      "description": "",
+      "image": ""
+     }
+  }
+  ]
+}