Merge pull request #29 from PolymerElements/ronnyroeller-fix/25

notwaldorf · web-flow · commit b39e10d68996 · 2018-01-29T16:45:28.000-06:00
Port to 2.0
diff --git a/bower.json b/bower.json
@@ -21,15 +21,29 @@
   "homepage": "https://github.com/PolymerElements/iron-swipeable-container",
   "ignore": [],
   "dependencies": {
-    "polymer": "Polymer/polymer#^1.1.0"
+    "polymer": "Polymer/polymer#1.9 - 2"
   },
   "devDependencies": {
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-    "web-component-tester": "^4.0.0",
-    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
-    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
-    "paper-card": "PolymerElements/paper-card#^1.0.0",
-    "paper-styles": "PolymerElements/paper-styles#^1.0.0"
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^1.0.0",
+    "web-component-tester": "^6.0.0",
+    "iron-component-page": "PolymerElements/iron-component-page#1 - 2",
+    "iron-test-helpers": "PolymerElements/iron-test-helpers#1 - 2",
+    "paper-card": "PolymerElements/paper-card#1 - 2",
+    "paper-styles": "PolymerElements/paper-styles#1 - 2"
+  },
+  "variants": {
+    "1.x": {
+      "dependencies": {
+        "polymer": "Polymer/polymer#^1.9"
+      },
+      "devDependencies": {
+        "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
+        "web-component-tester": "^4.0.0",
+        "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
+        "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
+        "paper-card": "PolymerElements/paper-card#^1.0.0",
+        "paper-styles": "PolymerElements/paper-styles#^1.0.0"
+      }
+    }
   }
 }
diff --git a/iron-swipeable-container.html b/iron-swipeable-container.html
@@ -60,7 +60,7 @@
         display: block;
       }
     </style>
-    <content id="content"></content>
+    <slot id="content"></slot>
   </template>
 </dom-module>
 
diff --git a/test/index.html b/test/index.html
@@ -18,7 +18,8 @@
 <body>
   <script>
     WCT.loadSuites([
-      'basic.html'
+      'basic.html?wc-shadydom=true&wc-ce=true',
+      'basic.html?dom=shadow'
     ]);
   </script>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`display: block;`
`61`	`61`	`}`
`62`	`62`	`</style>`
`63`		`- <content id="content"></content>`
	`63`	`+ <slot id="content"></slot>`
`64`	`64`	`</template>`
`65`	`65`	`</dom-module>`
`66`	`66`