Use new google-jsapi instead. Keeps existing functionality

ebidel · ebidel · commit 2fa201a43ade · 2014-04-30T15:52:05.000-07:00
diff --git a/bower.json b/bower.json
@@ -2,6 +2,6 @@
   "name": "polymer-google-jsapi",
   "private": true,
   "dependencies": {
-    "polymer": "Polymer/polymer#master"
+    "google-apis": "PolymerLabs/google-apis#master"
   }
 }
diff --git a/demo.html b/demo.html
@@ -1,25 +1,40 @@
 ﻿<!DOCTYPE html>
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
+Copyright 2014 The Polymer Authors. All rights reserved.
 Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 -->
 <html>
   <head>
-    <title></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>google-jsapi demo</title>
+    <meta charset="utf-8" />
     <script src="../platform/platform.js"></script>
     <link rel="import" href="polymer-google-jsapi.html">
   </head>
   <body>
     <polymer-google-jsapi id="jsapi"></polymer-google-jsapi>
+
+    <h3>Latest html5rocks.com articles</h3>
+    <ul>
+      <template id="t" repeat="{{entries}}">
+        <li>{{title}}</li>
+      </template>
+    </ul>
+
     <script>
-      jsapi.addEventListener('polymer-google-jsapi-loaded', function() {
-        google.load("feeds", "1", {callback: feedsLoaded});
-      });
       function feedsLoaded() {
-        alert("feeds loaded");
+        var feed = new google.feeds.Feed('http://feeds.feedburner.com/html5rocks');
+        feed.load(function(result) {
+          document.querySelector('#t').model = {
+            entries: result.feed.entries
+          }
+        });
       }
+
+      var jsapi = document.querySelector('#jsapi');
+      jsapi.addEventListener('polymer-google-jsapi-loaded', function(e) {
+        google.load('feeds', '1', {callback: feedsLoaded});
+      });
     </script>
   </body>
 </html>
diff --git a/polymer-google-jsapi.html b/polymer-google-jsapi.html
@@ -1,63 +1,23 @@
 <!--
-Copyright 2013 The Polymer Authors. All rights reserved.
+Copyright 2014 The Polymer Authors. All rights reserved.
 Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 -->
 <link rel="import" href="../polymer/polymer.html">
+<link rel="import" href="../google-apis/google-apis.html">
 
-<polymer-element name="polymer-google-jsapi">
-  <script>
-    (function() {
-      var state = '', instances = [], f;
-      function load() {
-        f = document.createElement('iframe');
-        f.style.display = 'none';
-        document.body.appendChild(f);
-        var d = f.contentWindow ? f.contentWindow.document : (f.contentDocument.document ? f.contentDocument.document : f.contentDocument);
-        d.open();
-        d.write(loader);
-        d.close();
-      }
-      var api;
-      var loaded = function(google) {
-        window.__polymer_google_jsapi = undefined;
-        window.google = api = google;
-        instances.forEach(function(i) {
-          i.provide();
-        });
-      }
-      var loader =  
-        '<script type="text/javascript" src="https://www.google.com/jsapi"></scr' + 'ipt>' +
-        '<script>parent.__polymer_google_jsapi(google);</scr' + 'ipt>'
-      ;
-      window.__polymer_google_jsapi = loaded;
-      
-      Polymer('polymer-google-jsapi', {
-        ready: function() {
-          switch (state) {
-            case '':
-              instances.push(this);
-              load();
-              state = 'pending';
-              break;
-            case 'pending':
-              instances.push(this);
-              break;
-            case 'ready':
-              this.provide();
-              break;
-          }
-        },
-        provide: function() {
-          this.asyncMethod('notify');
-        },
-        notify: function() {
-          this.fire('polymer-google-jsapi-loaded');
-        },
-        get google() {
-          return api;
-        }
-      });
-    })();
-  </script>
+
+<!--
+This element is deprecated. Please use google-jsapi instead.
+See https://github.com/PolymerLabs/google-apis.
+
+@status deprecated
+@element polymer-google-jsapi
+-->
+<polymer-element name="polymer-google-jsapi" extends="google-jsapi">
+<script>
+  Polymer({
+    notifyEvent: 'polymer-google-jsapi-loaded',
+  });
+</script>
 </polymer-element>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "polymer-google-jsapi",`
`3`	`3`	`"private": true,`
`4`	`4`	`"dependencies": {`
`5`		`- "polymer": "Polymer/polymer#master"`
	`5`	`+ "google-apis": "PolymerLabs/google-apis#master"`
`6`	`6`	`}`
`7`	`7`	`}`