From 23751f38db6d346a2c3fe445e2f595160acaa20b Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 16:14:04 -0800 Subject: [PATCH 1/7] bower update --- .gitignore | 2 +- bower.json | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8d4ae25..0e054a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -bower_components +bower_components* diff --git a/bower.json b/bower.json index 01535a9..29bd201 100644 --- a/bower.json +++ b/bower.json @@ -21,10 +21,21 @@ "apis" ], "dependencies": { - "polymer": "Polymer/polymer#^1.0.0", - "iron-jsonp-library": "PolymerElements/iron-jsonp-library#^1.0.0" + "polymer": "Polymer/polymer#2.0-preview", + "iron-jsonp-library": "PolymerElements/iron-jsonp-library#2.0-preview" }, "devDependencies": { - "iron-component-page": "PolymerElements/iron-component-page#^1.0.0" + "iron-component-page": "PolymerElements/iron-component-page#2.0-preview" + }, + "variants": { + "1.x": { + "dependencies": { + "polymer": "Polymer/polymer#^1.0.0", + "iron-jsonp-library": "PolymerElements/iron-jsonp-library#^1.0.0" + }, + "devDependencies": { + "iron-component-page": "PolymerElements/iron-component-page#^1.0.0" + } + } } } From ac9e1b16eebdeea3c2e3388fb9f0a77f2a172bc3 Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 16:14:15 -0800 Subject: [PATCH 2/7] events are composed --- google-client-loader.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/google-client-loader.html b/google-client-loader.html index 0257a86..d36a83b 100644 --- a/google-client-loader.html +++ b/google-client-loader.html @@ -162,7 +162,8 @@ _fireSuccess: function() { this.fire(this.successEventName, - { 'name': this.name, 'version': this.version }); + { 'name': this.name, 'version': this.version }, + { composed: true }); }, _fireError: function(response) { @@ -170,11 +171,13 @@ this.fire(this.errorEventName, { 'name': this.name, 'version': this.version, - 'error': response.error }); + 'error': response.error }, + { composed: true }); } else { this.fire(this.errorEventName, { 'name': this.name, - 'version': this.version }); + 'version': this.version }, + { composed: true }); } }, From 0d1580a595283d4eec3de4bc1035dd75b5a420a5 Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 4 Jan 2017 16:14:44 -0800 Subject: [PATCH 3/7] fixed demo reload issue on polymer 2 --- demo/index.html | 59 +++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/demo/index.html b/demo/index.html index a93fc19..0378ab5 100644 --- a/demo/index.html +++ b/demo/index.html @@ -10,38 +10,43 @@
- + + - t.loaded = function(e) { - document.querySelector('#messages').innerHTML += - e.target.localName + ' loaded' + '
'; - console.log(e.target.localName + ' loaded', event.target.api); - }; - + From 3601b5e7c75a1db5c75822b80127485b2fa9ce6d Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Tue, 11 Apr 2017 22:14:22 -0700 Subject: [PATCH 4/7] update polymer to rc --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 29bd201..15e38e8 100644 --- a/bower.json +++ b/bower.json @@ -21,7 +21,7 @@ "apis" ], "dependencies": { - "polymer": "Polymer/polymer#2.0-preview", + "polymer": "Polymer/polymer#^2.0.0-rc.1", "iron-jsonp-library": "PolymerElements/iron-jsonp-library#2.0-preview" }, "devDependencies": { From 2d0e94b1079dc70c1ddb7ab737bbf5585324891b Mon Sep 17 00:00:00 2001 From: Elliott Marquez Date: Wed, 12 Apr 2017 20:04:11 -0700 Subject: [PATCH 5/7] demo uses light dom and less polymer than before --- .gitignore | 1 + demo/index.html | 45 ++++++++++++++++++++++----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 0e054a7..1b3dfde 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bower_components* +bower-*.json \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index 0378ab5..0455cbb 100644 --- a/demo/index.html +++ b/demo/index.html @@ -10,8 +10,8 @@
- -