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

Convert all classes to use new-style class definitions. All tests pass.

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1651 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Schuyler Erle
2006-10-06 15:57:33 +00:00
parent 5280553306
commit 3be99e67e6
28 changed files with 93 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Layer/EventPane.js
+3 -6
View File
@@ -10,7 +10,7 @@
*/
OpenLayers.Layer.EventPane = OpenLayers.Class.create();
OpenLayers.Layer.EventPane.prototype =
OpenLayers.Util.extend(new OpenLayers.Layer, {
OpenLayers.Class.inherit( OpenLayers.Layer, {
/** EventPaned layers are always base layers, by necessity.
*
@@ -33,11 +33,8 @@ OpenLayers.Layer.EventPane.prototype =
*/
initialize: function(name, options) {
OpenLayers.Layer.prototype.initialize.apply(this, arguments);
if (arguments.length > 0) {
if (this.pane == null) {
this.pane = OpenLayers.Util.createDiv();
}
if (this.pane == null) {
this.pane = OpenLayers.Util.createDiv();
}
},
lib/OpenLayers/Layer/HTTPRequest.js
+1 -3
View File
@@ -28,9 +28,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
*/
initialize: function(name, url, params, options) {
var newArguments = arguments;
if (arguments.length > 0) {
newArguments = [name, options];
}
newArguments = [name, options];
OpenLayers.Layer.prototype.initialize.apply(this, newArguments);
this.url = url;
this.params = OpenLayers.Util.extend( new Object(), params);
lib/OpenLayers/Layer/KaMap.js
+1 -1
View File
@@ -31,7 +31,7 @@ OpenLayers.Layer.KaMap.prototype =
newArguments.push(name, url, params, options);
OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
this.params = (params ? params : {});
if (arguments.length > 0 && params) {
if (params) {
OpenLayers.Util.applyDefaults(
this.params,
this.DEFAULT_PARAMS
lib/OpenLayers/Layer/MapServer.js
+3 -5
View File
@@ -24,11 +24,9 @@ OpenLayers.Layer.MapServer.prototype =
*/
initialize: function(name, url, params) {
var newArguments = new Array();
if (arguments.length > 0) {
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params);
}
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params);
OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
if (arguments.length > 0) {
lib/OpenLayers/Layer/WFS.js
+9 -15
View File
@@ -52,26 +52,20 @@ OpenLayers.Layer.WFS.prototype =
*/
initialize: function(name, url, params, options) {
var newArguments = new Array();
if (arguments.length > 0) {
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
}
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
var newArguments = new Array();
if (arguments.length > 0) {
//uppercase params
newArguments.push(name, options);
}
//uppercase params
newArguments.push(name, options);
OpenLayers.Layer.Markers.prototype.initialize.apply(this, newArguments);
if (arguments.length > 0) {
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
}
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
},
lib/OpenLayers/Layer/WMS.js
+7 -12
View File
@@ -31,19 +31,14 @@ OpenLayers.Layer.WMS.prototype =
*/
initialize: function(name, url, params, options) {
var newArguments = new Array();
if (arguments.length > 0) {
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
}
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
if (arguments.length > 0) {
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
}
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
// unless explicitly set in options, if the layer is transparent,
// it will be an overlay
lib/OpenLayers/Layer/WMS/Untiled.js
+7 -12
View File
@@ -35,20 +35,15 @@ OpenLayers.Layer.WMS.Untiled.prototype =
*/
initialize: function(name, url, params, options) {
var newArguments = new Array();
if (arguments.length > 0) {
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
}
//uppercase params
params = OpenLayers.Util.upperCaseObject(params);
newArguments.push(name, url, params, options);
OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,
newArguments);
if (arguments.length > 0) {
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
}
OpenLayers.Util.applyDefaults(
this.params,
OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS)
);
// unless explicitly set in options, if the layer is transparent,
// it will be an overlay
lib/OpenLayers/Layer/WorldWind.js
+1 -1
View File
@@ -32,7 +32,7 @@ OpenLayers.Layer.WorldWind.prototype =
newArguments.push(name, url, params, options);
OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
this.params = (params ? params : {});
if (arguments.length > 0 && params) {
if (params) {
OpenLayers.Util.applyDefaults(
this.params,
this.DEFAULT_PARAMS