Caching array length instead of accessing it with each iteration. r=crschmidt (closes #1636)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7627 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -68,7 +68,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
|
||||
OpenLayers.Control.prototype.setMap.apply(this, arguments);
|
||||
|
||||
//make sure we dont already have an arg parser attached
|
||||
for(var i=0; i< this.map.controls.length; i++) {
|
||||
for(var i=0, len=this.map.controls.length; i<len; i++) {
|
||||
var control = this.map.controls[i];
|
||||
if ( (control != this) &&
|
||||
(control.CLASS_NAME == "OpenLayers.Control.ArgParser") ) {
|
||||
@@ -141,7 +141,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
|
||||
if (this.layers.length == this.map.layers.length) {
|
||||
this.map.events.unregister('addlayer', this, this.configureLayers);
|
||||
|
||||
for(var i=0; i < this.layers.length; i++) {
|
||||
for(var i=0, len=this.layers.length; i<len; i++) {
|
||||
|
||||
var layer = this.map.layers[i];
|
||||
var c = this.layers.charAt(i);
|
||||
|
||||
@@ -75,7 +75,7 @@ OpenLayers.Control.Attribution =
|
||||
updateAttribution: function() {
|
||||
var attributions = [];
|
||||
if (this.map && this.map.layers) {
|
||||
for(var i=0; i < this.map.layers.length; i++) {
|
||||
for(var i=0, len=this.map.layers.length; i<len; i++) {
|
||||
var layer = this.map.layers[i];
|
||||
if (layer.attribution && layer.getVisibility()) {
|
||||
attributions.push( layer.attribution );
|
||||
|
||||
@@ -36,7 +36,7 @@ OpenLayers.Control.EditingToolbar = OpenLayers.Class(
|
||||
new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Path, {'displayClass': 'olControlDrawFeaturePath'}),
|
||||
new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Polygon, {'displayClass': 'olControlDrawFeaturePolygon'})
|
||||
];
|
||||
for (var i = 0; i < controls.length; i++) {
|
||||
for (var i=0, len=controls.length; i<len; i++) {
|
||||
controls[i].featureAdded = function(feature) { feature.state = OpenLayers.State.INSERT; };
|
||||
}
|
||||
this.addControls(controls);
|
||||
|
||||
@@ -177,7 +177,7 @@ OpenLayers.Control.LayerSwitcher =
|
||||
clearLayersArray: function(layersType) {
|
||||
var layers = this[layersType + "Layers"];
|
||||
if (layers) {
|
||||
for(var i=0; i < layers.length; i++) {
|
||||
for(var i=0, len=layers.length; i<len ; i++) {
|
||||
var layer = layers[i];
|
||||
OpenLayers.Event.stopObservingElement(layer.inputElem);
|
||||
OpenLayers.Event.stopObservingElement(layer.labelSpan);
|
||||
@@ -201,7 +201,7 @@ OpenLayers.Control.LayerSwitcher =
|
||||
(this.map.layers.length != this.layerStates.length) ) {
|
||||
redraw = true;
|
||||
} else {
|
||||
for (var i=0; i < this.layerStates.length; i++) {
|
||||
for (var i=0, len=this.layerStates.length; i<len; i++) {
|
||||
var layerState = this.layerStates[i];
|
||||
var layer = this.map.layers[i];
|
||||
if ( (layerState.name != layer.name) ||
|
||||
@@ -243,8 +243,9 @@ OpenLayers.Control.LayerSwitcher =
|
||||
// We save this before redrawing, because in the process of redrawing
|
||||
// we will trigger more visibility changes, and we want to not redraw
|
||||
// and enter an infinite loop.
|
||||
this.layerStates = new Array(this.map.layers.length);
|
||||
for (var i = 0; i < this.map.layers.length; i++) {
|
||||
var len = this.map.layers.length;
|
||||
this.layerStates = new Array(len);
|
||||
for (var i=0; i <len; i++) {
|
||||
var layer = this.map.layers[i];
|
||||
this.layerStates[i] = {
|
||||
'name': layer.name,
|
||||
@@ -256,7 +257,7 @@ OpenLayers.Control.LayerSwitcher =
|
||||
|
||||
var layers = this.map.layers.slice();
|
||||
if (!this.ascending) { layers.reverse(); }
|
||||
for( var i = 0; i < layers.length; i++) {
|
||||
for(var i=0, len=layers.length; i<len; i++) {
|
||||
var layer = layers[i];
|
||||
var baseLayer = layer.isBaseLayer;
|
||||
|
||||
@@ -387,7 +388,7 @@ OpenLayers.Control.LayerSwitcher =
|
||||
updateMap: function() {
|
||||
|
||||
// set the newly selected base layer
|
||||
for(var i=0; i < this.baseLayers.length; i++) {
|
||||
for(var i=0, len=this.baseLayers.length; i<len; i++) {
|
||||
var layerEntry = this.baseLayers[i];
|
||||
if (layerEntry.inputElem.checked) {
|
||||
this.map.setBaseLayer(layerEntry.layer, false);
|
||||
@@ -395,7 +396,7 @@ OpenLayers.Control.LayerSwitcher =
|
||||
}
|
||||
|
||||
// set the correct visibilities for the overlays
|
||||
for(var i=0; i < this.dataLayers.length; i++) {
|
||||
for(var i=0, len=this.dataLayers.length; i<len; i++) {
|
||||
var layerEntry = this.dataLayers[i];
|
||||
layerEntry.layer.setVisibility(layerEntry.inputElem.checked);
|
||||
}
|
||||
|
||||
@@ -548,7 +548,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
this.virtualVertices = [];
|
||||
var control = this;
|
||||
function collectComponentVertices(geometry) {
|
||||
var i, vertex, component;
|
||||
var i, vertex, component, len;
|
||||
if(geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
|
||||
vertex = new OpenLayers.Feature.Vector(geometry);
|
||||
control.vertices.push(vertex);
|
||||
@@ -569,7 +569,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
|
||||
|
||||
// add virtual vertices in the middle of each edge
|
||||
if(geometry.CLASS_NAME != "OpenLayers.Geometry.MultiPoint") {
|
||||
for(i=0; i<geometry.components.length-1; ++i) {
|
||||
for(i=0, len=geometry.components.length; i<len-1; ++i) {
|
||||
var prevVertex = geometry.components[i];
|
||||
var nextVertex = geometry.components[i + 1];
|
||||
if(prevVertex.CLASS_NAME == "OpenLayers.Geometry.Point" &&
|
||||
|
||||
@@ -271,7 +271,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class(
|
||||
OpenLayers.Util.modifyAlphaImageDiv(this.buttons[this.mode], null, null, null, this.buttons[this.mode].imgLocation);
|
||||
}
|
||||
if (this.mode == "measure" && mode != "measure") {
|
||||
for(var i = 0; i < this.measureDivs.length; i++) {
|
||||
for(var i=0, len=this.measureDivs.length; i<len; i++) {
|
||||
if (this.measureDivs[i]) {
|
||||
this.map.layerContainerDiv.removeChild(this.measureDivs[i]);
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, {
|
||||
|
||||
var eventsToStop = ['dblclick','mousedown'];
|
||||
|
||||
for (var i = 0; i < eventsToStop.length; i++) {
|
||||
for (var i=0, len=eventsToStop.length; i<len; i++) {
|
||||
|
||||
OpenLayers.Event.observe(this.maximizeDiv,
|
||||
eventsToStop[i],
|
||||
|
||||
@@ -62,7 +62,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
activate: function() {
|
||||
if (OpenLayers.Control.prototype.activate.apply(this, arguments)) {
|
||||
for(var i = 0; i < this.controls.length; i++) {
|
||||
for(var i=0, len=this.controls.length; i<len; i++) {
|
||||
if (this.controls[i] == this.defaultControl) {
|
||||
this.controls[i].activate();
|
||||
}
|
||||
@@ -79,7 +79,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
deactivate: function() {
|
||||
if (OpenLayers.Control.prototype.deactivate.apply(this, arguments)) {
|
||||
for(var i = 0; i < this.controls.length; i++) {
|
||||
for(var i=0, len=this.controls.length; i<len; i++) {
|
||||
this.controls[i].deactivate();
|
||||
}
|
||||
return true;
|
||||
@@ -96,7 +96,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
*/
|
||||
draw: function() {
|
||||
OpenLayers.Control.prototype.draw.apply(this, arguments);
|
||||
for (var i = 0; i < this.controls.length; i++) {
|
||||
for (var i=0, len=this.controls.length; i<len; i++) {
|
||||
this.map.addControl(this.controls[i]);
|
||||
this.controls[i].deactivate();
|
||||
this.controls[i].events.on({
|
||||
@@ -115,7 +115,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
redraw: function() {
|
||||
this.div.innerHTML = "";
|
||||
if (this.active) {
|
||||
for (var i = 0; i < this.controls.length; i++) {
|
||||
for (var i=0, len=this.controls.length; i<len; i++) {
|
||||
var element = this.controls[i].panel_div;
|
||||
if (this.controls[i].active) {
|
||||
element.className = this.controls[i].displayClass + "ItemActive";
|
||||
@@ -149,7 +149,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
this.redraw();
|
||||
return;
|
||||
}
|
||||
for (var i = 0; i < this.controls.length; i++) {
|
||||
for (var i=0, len=this.controls.length; i<len; i++) {
|
||||
if (this.controls[i] != control) {
|
||||
if (this.controls[i].type != OpenLayers.Control.TYPE_TOGGLE) {
|
||||
this.controls[i].deactivate();
|
||||
@@ -179,7 +179,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
// control added to the panel.
|
||||
// Also, stop mousedowns and clicks, but don't stop mouseup,
|
||||
// since they need to pass through.
|
||||
for (var i = 0; i < controls.length; i++) {
|
||||
for (var i=0, len=controls.length; i<len; i++) {
|
||||
var element = document.createElement("div");
|
||||
var textNode = document.createTextNode(" ");
|
||||
controls[i].panel_div = element;
|
||||
@@ -193,7 +193,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
|
||||
}
|
||||
|
||||
if (this.map) { // map.addControl() has already been called on the panel
|
||||
for (var i = 0; i < controls.length; i++) {
|
||||
for (var i=0, len=controls.length; i<len; i++) {
|
||||
this.map.addControl(controls[i]);
|
||||
controls[i].deactivate();
|
||||
controls[i].events.on({
|
||||
|
||||
@@ -79,7 +79,7 @@ OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
|
||||
OpenLayers.Control.prototype.setMap.apply(this, arguments);
|
||||
|
||||
//make sure we have an arg parser attached
|
||||
for(var i=0; i< this.map.controls.length; i++) {
|
||||
for(var i=0, len=this.map.controls.length; i<len; i++) {
|
||||
var control = this.map.controls[i];
|
||||
if (control.CLASS_NAME == "OpenLayers.Control.ArgParser") {
|
||||
|
||||
@@ -153,7 +153,7 @@ OpenLayers.Control.Permalink = OpenLayers.Class(OpenLayers.Control, {
|
||||
params.lon = Math.round(lon*100000)/100000;
|
||||
|
||||
params.layers = '';
|
||||
for (var i=0; i < this.map.layers.length; i++) {
|
||||
for (var i=0, len=this.map.layers.length; i<len; i++) {
|
||||
var layer = this.map.layers[i];
|
||||
|
||||
if (layer.isBaseLayer) {
|
||||
|
||||
Reference in New Issue
Block a user