ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged r1559:r1587 from source:/sandbox/crschmidt/noprototype. OpenLayers is now Prototype-free(tm).

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1588 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2006-10-05 14:50:47 +00:00
parent 33c37ef78b
commit 67ced536c0
51 changed files with 688 additions and 1963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/OpenLayers/Layer/HTTPRequest.js
View File

@@ -7,9 +7,9 @@
*
* @requires OpenLayers/Layer.js
*/
OpenLayers.Layer.HTTPRequest = Class.create();
OpenLayers.Layer.HTTPRequest = OpenLayers.Class.create();
OpenLayers.Layer.HTTPRequest.prototype =
Object.extend( new OpenLayers.Layer(), {
OpenLayers.Util.extend( new OpenLayers.Layer(), {
/** @type String */
url: null,
@@ -33,7 +33,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
}
OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
this.url = url;
this.params = Object.extend( new Object(), params);
this.params = OpenLayers.Util.extend( new Object(), params);
},
/**
@@ -79,7 +79,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
* @param {Object} newParams
*/
mergeNewParams:function(newParams) {
this.params = Object.extend(this.params, newParams);
this.params = OpenLayers.Util.extend(this.params, newParams);
},
@@ -106,8 +106,8 @@ OpenLayers.Layer.HTTPRequest.prototype =
// create a new params hashtable with all the layer params and the
// new params together. then convert to string
var allParams = Object.extend(new Object(), this.params);
var allParams = Object.extend(allParams, newParams);
var allParams = OpenLayers.Util.extend(new Object(), this.params);
var allParams = OpenLayers.Util.extend(allParams, newParams);
var paramsString = OpenLayers.Util.getParameterString(allParams);
if (paramsString != "") {