mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes from jshint

Browse Source
This commit is contained in:
danzel
2012-07-25 10:47:22 +12:00
parent b104ace6f8
commit 2d71f7d8ef
5 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MarkerCluster.Default.css
+9 -9
View File
@@ -1,29 +1,29 @@
.marker-cluster-small {
background-color: rgba(181, 226, 140, 0.6);
}
}
.marker-cluster-small div {
background-color: rgba(110, 204, 57, 0.6);
}
}
.marker-cluster-medium {
background-color: rgba(241, 211, 87, 0.6);
}
}
.marker-cluster-medium div {
background-color: rgba(240, 194, 12, 0.6);
}
}
.marker-cluster-large {
background-color: rgba(253, 156, 115, 0.6);
}
}
.marker-cluster-large div {
background-color: rgba(241, 128, 23, 0.6);
}
}
.marker-cluster {
text-align: center;
background-clip: padding-box;
border-radius: 20px;
}
}
.marker-cluster div {
width: 30px;
height: 30px;
@@ -33,7 +33,7 @@
text-align: center;
border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
}
}
.marker-cluster span {
line-height: 30px;
}
}
src/MarkerCluster.Default.js
+1 -1
View File
@@ -1,4 +1,4 @@
(function () {
(function () {
L.MarkerClusterDefault = {
iconCreateFunction: function (childCount) {
var c = ' marker-cluster-';
src/MarkerCluster.Spiderfier.js
+6 -4
View File
@@ -1,4 +1,4 @@
//This code is 100% based on https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet
//This code is 100% based on https://github.com/jawj/OverlappingMarkerSpiderfier-Leaflet
//Huge thanks to jawj for implementing it first to make my job easy :-)
L.MarkerCluster.include({
@@ -15,7 +15,7 @@ L.MarkerCluster.include({
// 0 -> always spiral; Infinity -> always circle
spiderfy: function () {
if (this._group._spiderfied == this) {
if (this._group._spiderfied === this) {
return;
}
@@ -85,6 +85,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
//Non Animated versions of everything
_animationSpiderfy: function (childMarkers, positions) {
var group = this._group,
map = group._map,
i, m, leg;
for (i = childMarkers.length - 1; i >= 0; i--) {
@@ -128,6 +129,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
_animationSpiderfy: function (childMarkers, positions) {
var me = this,
group = this._group,
map = group._map,
i, m, leg;
for (i = childMarkers.length - 1; i >= 0; i--) {
@@ -199,7 +201,7 @@ L.MarkerCluster.include(!L.DomUtil.TRANSITION ? {
// Doing this at 250ms causes some minor flickering on FF, so just do it immediately
// If the initial opacity of the spiderlegs isn't 0 then they appear before the animation starts.
if (L.Browser.svg) {
setTimeout(function() {
setTimeout(function () {
for (i = childMarkers.length - 1; i >= 0; i--) {
m = childMarkers[i]._spiderLeg;
@@ -284,5 +286,5 @@ L.MarkerClusterGroup.include({
if (this._spiderfied) {
this._spiderfied.unspiderfy();
}
},
}
});
src/MarkerCluster.js
+7 -7
View File
@@ -149,7 +149,7 @@ L.MarkerCluster = L.Marker.extend({
//Check our children
for (i = markers.length - 1; i >= 0; i--) {
if (markers[i] == layer) {
if (markers[i] === layer) {
if (markers[i]._icon) {
L.FeatureGroup.prototype.removeLayer.call(group, markers[i]);
}
@@ -247,15 +247,15 @@ L.MarkerCluster = L.Marker.extend({
},
_recursivelyBecomeVisible: function (bounds, depth) {
this._recursively(bounds, 0, depth, null, function(c) {
this._recursively(bounds, 0, depth, null, function (c) {
c.setOpacity(1);
});
},
_recursivelyAddChildrenToMap: function (startPos, depth, bounds) {
this._recursively(bounds, 0, depth,
this._recursively(bounds, 0, depth,
function (c, recursionDepth) {
if (recursionDepth == 0) {
if (recursionDepth === 0) {
return;
}
@@ -343,7 +343,7 @@ L.MarkerCluster = L.Marker.extend({
//Run the given functions recursively to this and child clusters
// boundsToApplyTo: a L.LatLngBounds representing the bounds of what clusters to recurse in to
// depthToStartAt: the depth to start calling the given functions
// timesToRecurse: how many layers deep to recurse in to after hitting depthToStartAt, bottom level: depthToRunFor == 0
// timesToRecurse: how many layers deep to recurse in to after hitting depthToStartAt, bottom level: depthToRunFor == 0
// runAtEveryLevel: function that takes an L.MarkerCluster as an argument that should be applied on every level
// runAtBottomLevel: function that takes an L.MarkerCluster as an argument that should be applied at only the bottom level
_recursively: function (boundsToApplyTo, depthToStartAt, timesToRecurse, runAtEveryLevel, runAtBottomLevel) {
@@ -362,7 +362,7 @@ L.MarkerCluster = L.Marker.extend({
if (runAtEveryLevel) {
runAtEveryLevel(this, timesToRecurse);
}
if (timesToRecurse == 0 && runAtBottomLevel) {
if (timesToRecurse === 0 && runAtBottomLevel) {
runAtBottomLevel(this);
}
@@ -399,6 +399,6 @@ L.MarkerCluster = L.Marker.extend({
//Returns true if we are the parent of only one cluster and that cluster is the same as us
_isSingleParent: function () {
//Don't need to check this._markers as the rest won't work if there are any
return this._childClusters.length > 0 && this._childClusters[0]._childCount == this._childCount;
return this._childClusters.length > 0 && this._childClusters[0]._childCount === this._childCount;
}
});
src/MarkerClusterGroup.js
+13 -9
View File
@@ -258,7 +258,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
},
_animationAddLayer: function (layer, newCluster) {
L.FeatureGroup.prototype.addLayer.call(this, newCluster);
if (newCluster != layer && newCluster._childCount == 2) {
if (newCluster !== layer && newCluster._childCount === 2) {
newCluster._recursivelyRemoveChildrenFromMap(newCluster._bounds, 1);
}
}
@@ -269,13 +269,13 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
this._map._mapPane.className += ' leaflet-cluster-anim';
},
_animationEnd: function () {
this._map._mapPane.className = map._mapPane.className.replace(' leaflet-cluster-anim', '');
this._map._mapPane.className = this._map._mapPane.className.replace(' leaflet-cluster-anim', '');
this._inZoomAnimation--;
},
_animationZoomIn: function (previousZoomLevel, newZoomLevel) {
var me = this,
bounds = this._getExpandedVisibleBounds(),
i,
i,
depthToStartAt = 1 + previousZoomLevel - this._topClusterLevel._zoom,
depthToDescend = newZoomLevel - previousZoomLevel;
@@ -285,7 +285,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
markers = c._markers,
m;
if (c._isSingleParent() && depthToDescend == 1) { //Immediately add the new child and remove us
if (c._isSingleParent() && depthToDescend === 1) { //Immediately add the new child and remove us
L.FeatureGroup.prototype.removeLayer.call(me, c);
c._recursivelyAddChildrenToMap(null, depthToDescend, bounds);
} else {
@@ -307,14 +307,18 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
//Immediately fire an event to update the opacity and locations (If we immediately set it they won't animate)
setTimeout(function () {
var j, n;
//Update opacities
me._topClusterLevel._recursivelyBecomeVisible(bounds, depthToStartAt + depthToDescend);
//TODO Maybe? Update markers in _recursivelyBecomeVisible
for (i in me._layers) {
var n = me._layers[i];
for (j in me._layers) {
if (this._layers.hasOwnProperty(j)) {
n = me._layers[j];
if (!(n instanceof L.MarkerCluster) && n._icon) {
n.setOpacity(1);
if (!(n instanceof L.MarkerCluster) && n._icon) {
n.setOpacity(1);
}
}
}
@@ -376,7 +380,7 @@ L.MarkerClusterGroup.include(!L.DomUtil.TRANSITION ? {
var me = this;
L.FeatureGroup.prototype.addLayer.call(this, layer);
if (newCluster != layer) {
if (newCluster !== layer) {
if (newCluster._childCount > 2) { //Was already a cluster
this._animationStart();