Merge pull request #72 from PolymerElements/2.0-preview

2.0-preview

.gitignore

@@ -1 +1,2 @@
-bower_components
+bower_components*
+bower-*.json

.travis.yml

@@ -1,24 +1,28 @@
 language: node_js
 sudo: required
 before_script:
-  - npm install -g bower polylint web-component-tester
-  - bower install
-  - polylint
+  - npm install -g bower polymer-cli@next
+  - polymer install --variants
+  - sudo mv /usr/bin/google-chrome /usr/bin/google-chrome-old
+  - sudo mv /usr/bin/google-chrome-beta /usr/bin/google-chrome
 env:
   global:
     - secure: >-
         TYkyKHfqK31bPGX+x388nfvBWtoGhD7lwYYLdunZi2pwvR2N3ngzblklwK/ADgYVDC0y+lZaJsrODvQW2cUxVdQP8p+DifXoOig5b8S2H7HFFFf83gaXv0SJ50rIaKLQmXfBdI0ICFzeQOeJ9TlKvtF3/yn/LDpYftuzgbXIyp4=
     - secure: >-
         eUlJabqBW3P+MRieHvRcr446jhpV2YYRfZasOh3zh2vkAVsi5R5mPJXVBwk6xP4tdNPbRo0M3boKnMHjoK8AgFolxQwXpVaoOt/oiFUsBFIUNcwKnSdfnadQa6ON5VoDmPd9UhDwES/gq7i906XkV/1jwRKKhPkx1DCyCBfuTvM=
-node_js: '6'
+node_js: stable
 addons:
   firefox: latest
   apt:
     sources:
       - google-chrome
     packages:
-      - google-chrome-stable
+      - google-chrome-beta
+  sauce_connect: true
 script:
-  - xvfb-run wct
-  - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct -s ''default''; fi'
+  - xvfb-run polymer test
+  - >-
+    if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then polymer test -s 'default';
+    fi
 dist: trusty

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "paper-behaviors",
-  "version": "1.0.13",
+  "version": "2.0.0",
   "description": "Common behaviors across the paper elements",
   "authors": [
     "The Polymer Authors"
@@ -25,18 +25,36 @@
   "license": "http://polymer.github.io/LICENSE.txt",
   "homepage": "https://github.com/PolymerElements/paper-behaviors",
   "dependencies": {
-    "iron-behaviors": "PolymerElements/iron-behaviors#^1.0.0",
-    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0",
-    "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
-    "polymer": "Polymer/polymer#^1.2.1"
+    "iron-behaviors": "PolymerElements/iron-behaviors#2.0-preview",
+    "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#2.0-preview",
+    "paper-ripple": "PolymerElements/paper-ripple#2.0-preview",
+    "polymer": "Polymer/polymer#^2.0.0-rc.1"
   },
   "devDependencies": {
-    "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
-    "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
-    "paper-material": "PolymerElements/paper-material#^1.0.0",
-    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "web-component-tester": "^4.0.0",
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+    "iron-component-page": "polymerelements/iron-component-page#2.0-preview",
+    "iron-test-helpers": "polymerelements/iron-test-helpers#2.0-preview",
+    "paper-styles": "PolymerElements/paper-styles#2.0-preview",
+    "test-fixture": "PolymerElements/test-fixture#^3.0.0-rc.1",
+    "web-component-tester": "Polymer/web-component-tester#^6.0.0-prerelease.6",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0-rc.1"
   },
-  "ignore": []
+  "ignore": [],
+  "variants": {
+    "1.x": {
+      "dependencies": {
+        "iron-behaviors": "PolymerElements/iron-behaviors#^1.0.0",
+        "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0",
+        "paper-ripple": "PolymerElements/paper-ripple#^1.0.0",
+        "polymer": "Polymer/polymer#^1.2.1"
+      },
+      "devDependencies": {
+        "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
+        "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
+        "paper-styles": "PolymerElements/paper-styles#^1.0.0",
+        "test-fixture": "PolymerElements/test-fixture#^1.0.0",
+        "web-component-tester": "^4.0.0",
+        "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+      }
+    }
+  }
 }

demo/paper-button.html

@@ -9,12 +9,12 @@
 -->
 
 <link rel="import" href="../../polymer/polymer.html">
-<link rel="import" href="../../paper-material/paper-material.html">
+<link rel="import" href="../../paper-styles/element-styles/paper-material.html">
 <link rel="import" href="../paper-button-behavior.html">
 
 <dom-module id="paper-button">
   <template>
-    <style>
+    <style include="paper-material">
       :host {
         display: inline-block;
         position: relative;
@@ -30,7 +30,7 @@
         cursor: pointer;
       }
 
-      paper-material {
+      .content {
         border-radius: inherit;
         padding: 16px;
       }
@@ -47,9 +47,10 @@
       }
     </style>
 
-    <paper-material class="content" elevation="[[_elevation]]" animated>
-      <content></content>
-    </paper-material>
+    <!-- when using paper-material from paper-styles you must add a paper-material class -->
+    <div class="content paper-material" elevation$="[[elevation]]" animated>
+      <slot></slot>
+    </div>
   </template>
 
   <script>

demo/paper-radio-button.html

@@ -91,6 +91,8 @@
 
   <script>
     Polymer({
+      is: 'paper-radio-button',
+
       behaviors: [
         Polymer.PaperCheckedElementBehavior
       ],

test/index.html

@@ -1,29 +1,31 @@
-<!DOCTYPE html><!--
+<!DOCTYPE html>
+<!--
 @license
 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
 This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
 The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
---><html><head>
+-->
+<html>
+<head>
   <meta charset="utf-8">
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
 </head>
 <body>
   <script>
     WCT.loadSuites([
-      'paper-button-behavior.html',
-      'paper-radio-button-behavior.html',
-      'paper-checked-element-behavior.html',
-      'paper-ripple-behavior.html',
+      'paper-button-behavior.html?wc-shadydom=true&wc-ce=true',
+      'paper-radio-button-behavior.html?wc-shadydom=true&wc-ce=true',
+      'paper-checked-element-behavior.html?wc-shadydom=true&wc-ce=true',
+      'paper-ripple-behavior.html?wc-shadydom=true&wc-ce=true',
       'paper-button-behavior.html?dom=shadow',
       'paper-radio-button-behavior.html?dom=shadow',
       'paper-checked-element-behavior.html?dom=shadow',
       'paper-ripple-behavior.html?dom=shadow'
     ]);
   </script>
-
-
-</body></html>
+</body>
+</html>

test/paper-ripple-behavior.html

@@ -177,6 +177,7 @@
           function getTextLocation(ripple) {
             // build a Range to get the BCR of a given text node
             var r = document.createRange();
+            Polymer.dom.flush();
             r.selectNode(Polymer.dom(ripple.$.content).getDistributedNodes()[0]);
             return MockInteractions.middleOfNode(r);
           }

test/shadowed-ripple.html

@@ -27,7 +27,7 @@
       #wrapper {
         background: red;
       }
-      #wrapper > ::content  #source {
+      #wrapper > ::slotted(#source) {
         height: 25px;
         width: 50px;
         background: green;
@@ -39,7 +39,7 @@
       </div>
     </div>
     <div id="wrapper">
-      <content id="content"></content>
+      <slot id="content"></slot>
     </div>
   </template>
   <script>

test/test-button.html

@@ -14,7 +14,7 @@
 <dom-module id="test-button">
 
   <template>
-    <content></content>
+    <slot></slot>
   </template>
 
   <script>