Merge pull request #11 from Polymer/master

8/8 master -> stable
googlearchive · Aug 8, 2013 · e809e78 · e809e78
2 parents 91d9254 + e226de3
commit e809e78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/google-map/google-map.html b/google-map/google-map.html
@@ -33,6 +33,11 @@
       zoomChanged: function() {
         this.map.setZoom(this.zoom);
       },
+      showCenterMarkerChanged: function() {
+        if (this.centerMarker) {
+          this.centerMarker.setMap(this.showCenterMarker ? this.map : null);
+        }
+      },
       asyncUpdateCenter: function() {
         this.updateCenterJob = this.job(
             this.updateCenterJob, this.updateCenter, 0);
@@ -43,16 +48,13 @@
         this.updateCenterMarker();
       },
       updateCenterMarker: function() {
-        if (!this.showCenterMarker) {
-          this.centerMarker && this.centerMarker.setMap(null);
-          return;
-        }
         if (!this.centerMarker) {
           this.centerMarker = new google.maps.Marker({
             map: this.map
           });
         }
         this.centerMarker.setPosition(this.map.getCenter());
+        this.showCenterMarkerChanged();
       }
     });
   </script>

diff --git a/manifest.xml b/manifest.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0"?>
-<meta>
-  <polymer-element-meta name="ace-element"></polymer-element-meta>
-  <polymer-element-meta name="code-mirror"></polymer-element-meta>
-  <polymer-element-meta name="humane-js"></polymer-element-meta>
-  <polymer-element-meta name="js-beautify"></polymer-element-meta>
-  <polymer-element-meta name="smoothie-charts"></polymer-element-meta>
+<?xml version="1.0"?>
+<meta>
+  <polymer-element-meta name="ace-element"></polymer-element-meta>
+  <polymer-element-meta name="code-mirror"></polymer-element-meta>
+  <polymer-element-meta name="humane-js"></polymer-element-meta>
+  <polymer-element-meta name="js-beautify"></polymer-element-meta>
+  <polymer-element-meta name="chart-js"></polymer-element-meta>
+  <polymer-element-meta name="marked-js"></polymer-element-meta>
+  <polymer-element-meta name="smoothie-chart"></polymer-element-meta>
 </meta>