protect for in loops with hasOwnProperty

This commit is contained in:
Bart van den Eijnden
2012-02-29 18:43:55 +01:00
parent d7a3ecac08
commit e3cc96dbfb
31 changed files with 385 additions and 266 deletions
+4 -2
View File
@@ -218,8 +218,10 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
var urlParams =
OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
for(var key in allParams) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
if (allParams.hasOwnProperty(key)) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
}
}
}
paramsString = OpenLayers.Util.getParameterString(allParams);
+4 -2
View File
@@ -346,8 +346,10 @@ OpenLayers.Layer.MapGuide = OpenLayers.Class(OpenLayers.Layer.Grid, {
var urlParams = OpenLayers.Util.upperCaseObject(
OpenLayers.Util.getParameters(url));
for(var key in allParams) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
if (allParams.hasOwnProperty(key)) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
}
}
}
var paramsString = OpenLayers.Util.getParameterString(allParams);
+4 -2
View File
@@ -142,8 +142,10 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
var urlParams = OpenLayers.Util.upperCaseObject(
OpenLayers.Util.getParameters(url));
for(var key in allParams) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
if (allParams.hasOwnProperty(key)) {
if(key.toUpperCase() in urlParams) {
delete allParams[key];
}
}
}
paramsString = OpenLayers.Util.getParameterString(allParams);
+5 -3
View File
@@ -509,8 +509,10 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
if(!zoomChanged && coordSysUnchanged) {
for(var i in this.unrenderedFeatures) {
var feature = this.unrenderedFeatures[i];
this.drawFeature(feature);
if (this.unrenderedFeatures.hasOwnProperty(i)) {
var feature = this.unrenderedFeatures[i];
this.drawFeature(feature);
}
}
}
}
@@ -1023,4 +1025,4 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
},
CLASS_NAME: "OpenLayers.Layer.Vector"
});
});
+4 -2
View File
@@ -229,8 +229,10 @@ OpenLayers.Layer.WMTS = OpenLayers.Class(OpenLayers.Layer.Grid, {
matrixSet: true
};
for (var prop in required) {
if (!(prop in config)) {
throw new Error("Missing property '" + prop + "' in layer configuration.");
if (required.hasOwnProperty(prop)) {
if (!(prop in config)) {
throw new Error("Missing property '" + prop + "' in layer configuration.");
}
}
}