From 361d3896778f224af76e3cb88a141733b9f7f445 Mon Sep 17 00:00:00 2001 From: Samuel Li Date: Fri, 28 Apr 2017 12:47:06 -0700 Subject: [PATCH 1/7] Initial conversion --- bower.json | 12 +++++------ demo/index.html | 36 +++++++++++++++++--------------- demo/kml.html | 2 +- demo/polys.html | 2 +- google-map-marker.html | 2 +- google-map-poly.html | 4 +++- google-map.html | 4 ++-- test/google-map-basic.html | 2 +- test/google-map-update-pos.html | 2 +- test/marker-basic.html | 8 +++---- test/markers-add-remove.html | 6 +++--- test/origin-tests.html | 2 +- test/poly-basic.html | 2 +- test/poly-custom-properties.html | 2 +- 14 files changed, 45 insertions(+), 41 deletions(-) diff --git a/bower.json b/bower.json index fcfa287..df48f1d 100644 --- a/bower.json +++ b/bower.json @@ -28,13 +28,13 @@ "maps" ], "dependencies": { - "polymer": "Polymer/polymer#^1.7.1", - "google-apis": "GoogleWebComponents/google-apis#^1.1.7", - "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.5", - "iron-selector": "PolymerElements/iron-selector#^1.5.2" + "polymer": "Polymer/polymer#^2.0.0-rc.7", + "google-apis": "GoogleWebComponents/google-apis#2.0-preview", + "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#2.0-preview", + "iron-selector": "PolymerElements/iron-selector#2.0-preview" }, "devDependencies": { - "web-component-tester": "*", - "iron-component-page": "PolymerElements/iron-component-page#^1.1.7" + "web-component-tester": "^6.0.0-prerelease.6", + "iron-component-page": "PolymerElements/iron-component-page#2.0-preview" } } diff --git a/demo/index.html b/demo/index.html index a7d52aa..3e2c613 100644 --- a/demo/index.html +++ b/demo/index.html @@ -4,7 +4,7 @@ Google Map demo - + @@ -23,23 +23,25 @@ - + diff --git a/demo/kml.html b/demo/kml.html index ee27a70..0524401 100644 --- a/demo/kml.html +++ b/demo/kml.html @@ -4,7 +4,7 @@ Google Map Poly demo - + - + + diff --git a/test/google-map-update-pos.html b/test/google-map-update-pos.html index 5872ece..e411ad5 100644 --- a/test/google-map-update-pos.html +++ b/test/google-map-update-pos.html @@ -4,7 +4,7 @@ - + diff --git a/test/marker-basic.html b/test/marker-basic.html index 6f88e81..9d4a355 100644 --- a/test/marker-basic.html +++ b/test/marker-basic.html @@ -4,16 +4,16 @@ - + - - - + + + + - - + + + diff --git a/test/poly-basic.html b/test/poly-basic.html index d4efbaf..3c8b064 100644 --- a/test/poly-basic.html +++ b/test/poly-basic.html @@ -4,7 +4,7 @@ - + diff --git a/test/poly-custom-properties.html b/test/poly-custom-properties.html index 6d98437..c5133cc 100644 --- a/test/poly-custom-properties.html +++ b/test/poly-custom-properties.html @@ -4,7 +4,7 @@ - + From 23184704a1e72ec7e2c35e45a2d28e6bfc4f199f Mon Sep 17 00:00:00 2001 From: Samuel Li Date: Fri, 28 Apr 2017 14:14:23 -0700 Subject: [PATCH 2/7] Add install variants --- bower.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bower.json b/bower.json index df48f1d..b8eb08f 100644 --- a/bower.json +++ b/bower.json @@ -36,5 +36,19 @@ "devDependencies": { "web-component-tester": "^6.0.0-prerelease.6", "iron-component-page": "PolymerElements/iron-component-page#2.0-preview" + }, + "variants": { + "1.x": { + "dependencies": { + "polymer": "Polymer/polymer#^1.8.0", + "google-apis": "GoogleWebComponents/google-apis#^1.1.7", + "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.5", + "iron-selector": "PolymerElements/iron-selector#^1.5.2" + }, + "devDependencies": { + "web-component-tester": "*", + "iron-component-page": "PolymerElements/iron-component-page#^1.1.7" + } + } } } From 22464e28ad703f13b787c9221cd135f94bf7f4fd Mon Sep 17 00:00:00 2001 From: Samuel Li Date: Fri, 28 Apr 2017 14:22:40 -0700 Subject: [PATCH 3/7] Fix default slot --- google-map.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-map.html b/google-map.html index 5836a35..833897a 100644 --- a/google-map.html +++ b/google-map.html @@ -100,7 +100,7 @@ - +