Merge pull request #42 from prushforth/builds

Fix issues in builds uncovered in 0.1.0 release due to not using the most recent

Author: prushforth

map-area.html

@@ -4,7 +4,7 @@
 
 <!-- this is a modified version of leaflet which uses Polymer.dom instead of 
      regular DOM API calls so as to work with Shadow/Shady DOM custom elements -->
-<script src="../polymer-leaflet/leaflet.js"></script>
+<script src="../polymer-leaflet/leaflet-src.js"></script>
 <script src="../proj4Leaflet/lib/proj4-compressed.js"></script>
 <script src="../proj4Leaflet/src/proj4leaflet.js"></script>
 <script src="../mapml-leaflet-plugin/mapml.min.js"></script>

map-layer.html

@@ -4,7 +4,7 @@
 
 <!-- this is a modified version of leaflet which uses Polymer.dom instead of 
      regular DOM API calls so as to work with Shadow/Shady DOM custom elements -->
-<script src="../polymer-leaflet/leaflet.js"></script>
+<script src="../polymer-leaflet/leaflet-src.js"></script>
 <script src="../proj4Leaflet/lib/proj4-compressed.js"></script>
 <script src="../proj4Leaflet/src/proj4leaflet.js"></script>
 <script src="../mapml-leaflet-plugin/mapml.min.js"></script>

web-map.html

@@ -6,7 +6,7 @@
 
 <!-- this is a modified version of leaflet which uses Polymer.dom instead of 
      regular DOM API calls so as to work with Shadow/Shady DOM custom elements -->
-<script src="../polymer-leaflet/leaflet.js"></script>
+<script src="../polymer-leaflet/leaflet-src.js"></script>
 <script src="../proj4Leaflet/lib/proj4-compressed.js"></script>
 <script src="../proj4Leaflet/src/proj4leaflet.js"></script>
 <script src="../mapml-leaflet-plugin/mapml.min.js"></script>
@@ -149,6 +149,28 @@
         this.lon = this._map.getCenter().lng;
         this.zoom = this._map.getZoom();
     },
+    ready: function () {
+        // when used in a custom element, the leaflet script element is hidden inside
+        // the import's shadow dom.
+        L.Icon.Default.imagePath = (function () {
+                var imp = document.querySelector('link[rel="import"][href*="web-map.html"]'),
+                    doc = imp ? imp.import : document,
+                    scripts = doc.getElementsByTagName('script'),
+                    leafletRe = /[\/^]leaflet[\-\._]?([\w\-\._]*)\.js\??/;
+
+                var i, len, src, path;
+
+                for (i = 0, len = scripts.length; i < len; i++) {
+                        src = scripts[i].src;
+
+                        if (src.match(leafletRe)) {
+                                path = src.split(leafletRe)[0];
+                                return (path ? path + '/' : '') + 'images';
+                        }
+                }
+        }());
+      
+    },
     attached: function() {
       this.async( function () {
         console.log(this.localName + '#' + this.id + ' was attached');
@@ -180,11 +202,11 @@
             // _container.innerHTML does not work properly if the engine is throwing
             // exceptions because there are no area element children of the image map
             // for firefox only, a workaround is to actually remove the image...
-            if (L.Browser.gecko) {
-                this.poster.removeAttribute('usemap');
-            }
             if (this.poster) {
-                Polymer.dom(this.$.map).appendChild(this.poster);
+              if (L.Browser.gecko) {
+                  this.poster.removeAttribute('usemap');
+              }
+              Polymer.dom(this.$.map).appendChild(this.poster);
             }
           }
         }