Merge pull request #651 from brianbancroft/master

A solution to issue #647
Esri · Oct 14, 2015 · 780c960 · 780c960
2 parents eea863f + 7ab39f9
commit 780c960
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Layers/BasemapLayer.js b/src/Layers/BasemapLayer.js
@@ -53,7 +53,7 @@ export var BasemapLayer = L.TileLayer.extend({
           maxZoom: 16,
           subdomains: ['server', 'services'],
           pane: (pointerEvents) ? 'esri-labels' : 'tilePane'
-        }
+          }
       },
       NationalGeographic: {
         urlTemplate: tileProtocol + '//{s}.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}',
@@ -86,6 +86,7 @@ export var BasemapLayer = L.TileLayer.extend({
           maxZoom: 16,
           subdomains: ['server', 'services'],
           pane: (pointerEvents) ? 'esri-labels' : 'tilePane'
+
         }
       },
       Gray: {
@@ -247,7 +248,9 @@ export var BasemapLayer = L.TileLayer.extend({
   },
 
   getAttribution: function () {
-    var attribution = '<span class="esri-attributions" style="line-height:14px; vertical-align: -3px; text-overflow:ellipsis; white-space:nowrap; overflow:hidden; display:inline-block;">' + this.options.attribution + '</span>';
+    if (this.options.attribution) {
+      var attribution = '<span class="esri-attributions" style="line-height:14px; vertical-align: -3px; text-overflow:ellipsis; white-space:nowrap; overflow:hidden; display:inline-block;">' + this.options.attribution + '</span>';
+    }
     return attribution;
   },