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:
@@ -8,7 +8,7 @@
|
||||
* @requires OpenLayers/Util.js
|
||||
* @requires OpenLayers/Events.js
|
||||
*/
|
||||
OpenLayers.Map = Class.create();
|
||||
OpenLayers.Map = OpenLayers.Class.create();
|
||||
OpenLayers.Map.TILE_WIDTH = 256;
|
||||
OpenLayers.Map.TILE_HEIGHT = 256;
|
||||
OpenLayers.Map.prototype = {
|
||||
@@ -152,7 +152,7 @@ OpenLayers.Map.prototype = {
|
||||
// Else updateSize on catching the window's resize
|
||||
// Note that this is ok, as updateSize() does nothing if the
|
||||
// map's size has not actually changed.
|
||||
Event.observe(window, 'resize',
|
||||
OpenLayers.Event.observe(window, 'resize',
|
||||
this.updateSize.bindAsEventListener(this));
|
||||
}
|
||||
|
||||
@@ -173,7 +173,7 @@ OpenLayers.Map.prototype = {
|
||||
this.popups = new Array();
|
||||
|
||||
// always call map.destroy()
|
||||
Event.observe(window,
|
||||
OpenLayers.Event.observe(window,
|
||||
'unload',
|
||||
this.destroy.bindAsEventListener(this));
|
||||
|
||||
@@ -213,7 +213,7 @@ OpenLayers.Map.prototype = {
|
||||
|
||||
// now add the options declared by the user
|
||||
// (these will override defaults)
|
||||
Object.extend(this, options);
|
||||
OpenLayers.Util.extend(this, options);
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -513,7 +513,7 @@ OpenLayers.Map.prototype = {
|
||||
|
||||
// Workaround for the fact that hidden elements return 0 for size.
|
||||
if (size.w == 0 && size.h == 0) {
|
||||
var dim = Element.getDimensions(this.div);
|
||||
var dim = OpenLayers.Element.getDimensions(this.div);
|
||||
size.w = dim.width;
|
||||
size.h = dim.height;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user