Merge pull request #937 from Turbo87/layer-switcher

LayerSwitcher: Simplified checkRedraw() method
This commit is contained in:
ahocevar
2013-04-20 02:20:26 -07:00
+13 -14
View File
@@ -246,24 +246,23 @@ OpenLayers.Control.LayerSwitcher =
* {Boolean} The layer state changed since the last redraw() call. * {Boolean} The layer state changed since the last redraw() call.
*/ */
checkRedraw: function() { checkRedraw: function() {
var redraw = false;
if ( !this.layerStates.length || if ( !this.layerStates.length ||
(this.map.layers.length != this.layerStates.length) ) { (this.map.layers.length != this.layerStates.length) ) {
redraw = true; return true;
} else { }
for (var i=0, len=this.layerStates.length; i<len; i++) {
var layerState = this.layerStates[i]; for (var i = 0, len = this.layerStates.length; i < len; i++) {
var layer = this.map.layers[i]; var layerState = this.layerStates[i];
if ( (layerState.name != layer.name) || var layer = this.map.layers[i];
(layerState.inRange != layer.inRange) || if ( (layerState.name != layer.name) ||
(layerState.id != layer.id) || (layerState.inRange != layer.inRange) ||
(layerState.visibility != layer.visibility) ) { (layerState.id != layer.id) ||
redraw = true; (layerState.visibility != layer.visibility) ) {
break; return true;
}
} }
} }
return redraw;
return false;
}, },
/** /**