Merge pull request #79 from e111077/2.0-preview

e111077 · web-flow · commit c393ae373c7c · 2017-04-12T20:07:59.000-07:00
2.0-preview
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-bower_components
+bower_components*
+bower-*.json
diff --git 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.0-rc.1",
+    "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"
+      }
+    }
   }
 }
diff --git a/demo/index.html b/demo/index.html
@@ -10,38 +10,42 @@
 <body>
   <div id="messages"></div>
 
-  <template  id="t" is="dom-bind">
+  <dom-bind id="bind">
+    <template id="t" is="dom-bind">
 
-    <google-client-loader id="shortener"
-      name="urlshortener"
-      version="v1"
-      on-google-api-load="loadedShortener"></google-client-loader>
-    <google-js-api on-js-api-load="loaded"></google-js-api>
-    <google-plusone-api on-api-load="loaded"></google-plusone-api>
-    <google-realtime-api on-api-load="loaded"></google-realtime-api>
-    <google-maps-api on-api-load="loaded"></google-maps-api>
-    <google-youtube-api on-api-load="loaded"></google-youtube-api>
-    <google-legacy-loader on-api-load="loaded"></google-legacy-loader>
-
-  </template>
+      <google-client-loader id="shortener"
+        name="urlshortener"
+        version="v1"
+        on-google-api-load="loadedShortener"></google-client-loader>
+      <google-js-api on-js-api-load="loaded"></google-js-api>
+      <google-plusone-api on-api-load="loaded"></google-plusone-api>
+      <google-realtime-api on-api-load="loaded"></google-realtime-api>
+      <google-maps-api on-api-load="loaded"></google-maps-api>
+      <google-youtube-api on-api-load="loaded"></google-youtube-api>
+      <google-legacy-loader on-api-load="loaded"></google-legacy-loader>
 
+    </template>
+  </dom-bind>
   <script>
-    var t = document.querySelector('#t');
-
+    // polymer 1.x compatibility
     t.loadedShortener = function(event) {
       var request = event.target.api.url.get({
         shortUrl: 'http://goo.gl/fbsS'
       })
       request.execute(function(resp) {
         console.log(resp);
       });
-    };
+    }
 
     t.loaded = function(e) {
       document.querySelector('#messages').innerHTML +=
         e.target.localName + ' loaded' + '<br>';
       console.log(e.target.localName + ' loaded', event.target.api);
-    };
+    }
+
+    // Polymer 2.0 compatibility
+    bind.loadedShortener = t.loadedShortener;
+    bind.loaded = t.loaded;
   </script>
 </body>
 </html>
diff --git a/google-client-loader.html b/google-client-loader.html
@@ -162,19 +162,22 @@
 
       _fireSuccess: function() {
         this.fire(this.successEventName,
-            { 'name': this.name, 'version': this.version });
+            { 'name': this.name, 'version': this.version },
+            { composed: true });
       },
 
       _fireError: function(response) {
         if (response && response.error) {
           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 });
         }
       },
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-bower_components`
	`1`	`+bower_components*`
	`2`	`+bower-*.json`