Merge pull request #5 from PolymerLabs/usecoreloader

frankiefu · frankiefu · commit c8c1e9db0fab · 2014-05-01T22:39:17.000-07:00
Use core-shared-lib
diff --git a/demo.html b/demo.html
@@ -1,35 +1,40 @@
 <!DOCTYPE html>
 <!--
 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
-The complete set of authors may be found at http://polymer.github.io/AUTHORS
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
 Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
 <html>
   <head>
     <title>Google Map</title>
     <script src="../platform/platform.js"></script>
     <link rel="import" href="google-map.html">
     <link rel="import" href="google-map-directions.html">
+    <style>
+      body, html {
+        height: 100%;
+        margin: 0;
+      }
+      google-map {
+        display: block;
+        height: 100%;
+      }
+    </style>
   </head>
   <body>
-    <polymer-element name="x-map-example" noscript>
-      <template>
-        <style>
-          google-map {
-            display: block;
-            height: 600px;
-          }
-        </style>
-        
-        <google-map map="{{map}}"></google-map>
-        <google-map-directions map="{{map}}" startAddress="San Francisco" endAddress="Mountain View"></google-map-directions>
-        
-      </template>
-    </polymer-element>
     
-    <x-map-example></x-map-example>
+    <google-map disableDefaultUI></google-map>
+    <google-map-directions startAddress="San Francisco" endAddress="Mountain View"></google-map-directions>
+
+    <script>
+      document.addEventListener('polymer-ready', function(e) {
+        var dir = document.querySelector('google-map-directions');
+        var gmap = document.querySelector('google-map');
+        dir.map = gmap.map;
+      });
+    </script>
   </body>
 </html>
diff --git a/google-map.html b/google-map.html
@@ -1,25 +1,26 @@
 <!--
 Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE
-The complete set of authors may be found at http://polymer.github.io/AUTHORS
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
 Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
+
 <!--
-/**
- *
- * Google Maps element
- *
- * @class google-map
- * @blurb Element wrapper around Google Maps API.
- * @snap http://polymer.github.io/google-map/snap.png
- * @author The Polymer Authors
- * @categories Charts and Graphs
- *
- */
+Google Maps element
+
+@blurb Element wrapper around Google Maps API.
+@snap http://polymer.github.io/google-map/snap.png
+@author The Polymer Authors
+@categories Charts and Graphs
+
+@group Polymer Lab Elements
+@element google-map
+@homepage github.io
 -->
 
+<link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../google-apis/google-apis.html">
 
 <polymer-element name="google-map" attributes="latitude longitude zoom showCenterMarker version sensor map mapType disableDefaultUI">
@@ -132,4 +133,4 @@
   });
   
 </script>
-</polymer-element>
+</polymer-element>
