diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js index 3126583d4a..da48193238 100644 --- a/lib/OpenLayers/Layer/GeoRSS.js +++ b/lib/OpenLayers/Layer/GeoRSS.js @@ -211,7 +211,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, { for(var i=0; i < this.layer.map.popups.length; i++) { this.layer.map.removePopup(this.layer.map.popups[i]); } - }.bindAsEventListener(this)); + }.bind(this)); this.layer.map.addPopup(popup); } OpenLayers.Event.stop(evt); diff --git a/lib/OpenLayers/Layer/MapServer/Untiled.js b/lib/OpenLayers/Layer/MapServer/Untiled.js index 5b1f870eaa..f6fbcaf9b4 100644 --- a/lib/OpenLayers/Layer/MapServer/Untiled.js +++ b/lib/OpenLayers/Layer/MapServer/Untiled.js @@ -201,7 +201,7 @@ OpenLayers.Layer.MapServer.Untiled = OpenLayers.Class( this.events.triggerEvent("loadend"); } OpenLayers.Event.observe(this.tile.imgDiv, 'load', - onload.bindAsEventListener(this)); + onload.bind(this)); } else { this.tile.moveTo(tileBounds, pos); } diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index e8183fd886..ac45c31adf 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -298,7 +298,7 @@ OpenLayers.Map = OpenLayers.Class({ // Note that this is ok, as updateSize() does nothing if the // map's size has not actually changed. OpenLayers.Event.observe(window, 'resize', - this.updateSize.bindAsEventListener(this)); + this.updateSize.bind(this)); } // only append link stylesheet if the theme property is set @@ -343,7 +343,7 @@ OpenLayers.Map = OpenLayers.Class({ this.popups = new Array(); - this.unloadDestroy = this.destroy.bindAsEventListener(this); + this.unloadDestroy = this.destroy.bind(this); // always call map.destroy() diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index a448d2030b..a01802dea0 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -194,7 +194,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { http://openlayers.org/pipermail/dev/2007-January/000205.html OpenLayers.Event.observe( this.imgDiv, "load", - this.checkImgURL.bindAsEventListener(this) ); + this.checkImgURL.bind(this) ); */ this.frame.appendChild(this.imgDiv); this.layer.div.appendChild(this.frame); @@ -223,8 +223,7 @@ OpenLayers.Tile.Image = OpenLayers.Class(OpenLayers.Tile, { this.events.triggerEvent("loadend"); } } - OpenLayers.Event.observe(this.imgDiv, 'load', - onload.bindAsEventListener(this)); + OpenLayers.Event.observe(this.imgDiv, 'load', onload.bind(this)); }, diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index ac8874b1ff..07316bc173 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -239,9 +239,9 @@ OpenLayers.Util.createImage = function(id, px, sz, imgURL, position, border, if(delayDisplay) { image.style.display = "none"; OpenLayers.Event.observe(image, "load", - OpenLayers.Util.onImageLoad.bindAsEventListener(image)); + OpenLayers.Util.onImageLoad.bind(image)); OpenLayers.Event.observe(image, "error", - OpenLayers.Util.onImageLoadError.bindAsEventListener(image)); + OpenLayers.Util.onImageLoadError.bind(image)); } @@ -434,9 +434,9 @@ OpenLayers.Util.createAlphaImageDiv = function(id, px, sz, imgURL, if (delayDisplay) { img.style.display = "none"; OpenLayers.Event.observe(img, "load", - OpenLayers.Util.onImageLoad.bindAsEventListener(div)); + OpenLayers.Util.onImageLoad.bind(div)); OpenLayers.Event.observe(img, "error", - OpenLayers.Util.onImageLoadError.bindAsEventListener(div)); + OpenLayers.Util.onImageLoadError.bind(div)); } OpenLayers.Util.modifyAlphaImageDiv(div, id, px, sz, imgURL, position,