Merge pull request #136 from spacelag/master

Removed some trailing whitespace causing a build break on OSX
This commit is contained in:
Dave Leaver
2013-02-24 12:10:50 -08:00
4 changed files with 10 additions and 9 deletions
+5 -4
View File
@@ -660,7 +660,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
return;
}
//Didn't manage to cluster in at this zoom, record us as a marker here and continue upwards
gridUnclustered[zoom].addObject(layer, markerPoint);
}
@@ -688,7 +688,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._moveEnd();
}
},
//Gets the maps visible bounds expanded in each direction by the size of the screen (so the user cannot see an area we do not cover in one pan)
_getExpandedVisibleBounds: function () {
if (!this.options.removeOutsideVisibleBounds) {
@@ -1031,7 +1031,7 @@ L.MarkerCluster = L.Marker.extend({
}
L.FeatureGroup.prototype.addLayer.call(this._group, this);
},
_recursivelyAnimateChildrenIn: function (bounds, center, maxZoom) {
this._recursively(bounds, 0, maxZoom - 1,
function (c) {
@@ -1729,7 +1729,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
m, i, a;
group._animationStart();
//Make us visible and bring the child markers back in
this.setOpacity(1);
for (i = childMarkers.length - 1; i >= 0; i--) {
@@ -1879,4 +1879,5 @@ L.MarkerClusterGroup.include({
}(this));
+2 -2
View File
@@ -243,7 +243,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
m, i, a;
group._animationStart();
//Make us visible and bring the child markers back in
this.setOpacity(1);
for (i = childMarkers.length - 1; i >= 0; i--) {
@@ -389,4 +389,4 @@ L.MarkerClusterGroup.include({
delete layer._spiderLeg;
}
}
});
});
+1 -1
View File
@@ -129,7 +129,7 @@ L.MarkerCluster = L.Marker.extend({
}
L.FeatureGroup.prototype.addLayer.call(this._group, this);
},
_recursivelyAnimateChildrenIn: function (bounds, center, maxZoom) {
this._recursively(bounds, 0, maxZoom - 1,
function (c) {
+2 -2
View File
@@ -653,7 +653,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
return;
}
//Didn't manage to cluster in at this zoom, record us as a marker here and continue upwards
gridUnclustered[zoom].addObject(layer, markerPoint);
}
@@ -681,7 +681,7 @@ L.MarkerClusterGroup = L.FeatureGroup.extend({
this._moveEnd();
}
},
//Gets the maps visible bounds expanded in each direction by the size of the screen (so the user cannot see an area we do not cover in one pan)
_getExpandedVisibleBounds: function () {
if (!this.options.removeOutsideVisibleBounds) {