Merged r1559:r1587 from source:/sandbox/crschmidt/noprototype. OpenLayers is now Prototype-free(tm).
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1588 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
/**
|
||||
* @class
|
||||
*/
|
||||
OpenLayers.Layer = Class.create();
|
||||
OpenLayers.Layer = OpenLayers.Class.create();
|
||||
OpenLayers.Layer.prototype = {
|
||||
|
||||
/** @type String */
|
||||
@@ -99,10 +99,10 @@ OpenLayers.Layer.prototype = {
|
||||
if (arguments.length > 0) {
|
||||
|
||||
//store a copy of the custom options for later cloning
|
||||
this.options = Object.extend(new Object(), options);
|
||||
this.options = OpenLayers.Util.extend(new Object(), options);
|
||||
|
||||
//add options to layer
|
||||
Object.extend(this, this.options);
|
||||
OpenLayers.Util.extend(this, this.options);
|
||||
|
||||
this.name = name;
|
||||
|
||||
@@ -166,10 +166,10 @@ OpenLayers.Layer.prototype = {
|
||||
addOptions: function (newOptions) {
|
||||
|
||||
// update our copy for clone
|
||||
Object.extend(this.options, newOptions);
|
||||
OpenLayers.Util.extend(this.options, newOptions);
|
||||
|
||||
// add new options to this
|
||||
Object.extend(this, this.options);
|
||||
OpenLayers.Util.extend(this, this.options);
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user