diff --git a/lib/OpenLayers/Control/DragFeature.js b/lib/OpenLayers/Control/DragFeature.js index d84d6f7738..012ac76142 100644 --- a/lib/OpenLayers/Control/DragFeature.js +++ b/lib/OpenLayers/Control/DragFeature.js @@ -26,14 +26,10 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { * send a list of strings corresponding to the geometry class names. */ geometryTypes: null, - + /** * APIProperty: onStart - * {Function} *Deprecated*. Register for "beforefeaturemodified" instead. - * The "beforefeaturemodified" event is triggered on the layer before - * any modification begins. - * - * Define this function if you want to know when a drag starts. + * {Function} Define this function if you want to know when a drag starts. * The function should expect to receive two arguments: the feature * that is about to be dragged and the pixel location of the mouse. * @@ -46,11 +42,7 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { /** * APIProperty: onDrag - * {Function} *Deprecated*. Register for "featuremodified" instead. - * The "featuremodified" event is triggered on the layer with each - * feature modification. - * - * Define this function if you want to know about each move of a + * {Function} Define this function if you want to know about each move of a * feature. The function should expect to receive two arguments: the * feature that is being dragged and the pixel location of the mouse. * @@ -62,11 +54,7 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { /** * APIProperty: onComplete - * {Function} *Deprecated*. Register for "afterfeaturemodified" instead. - * The "afterfeaturemodified" event is triggered on the layer after - * a feature has been modified. - * - * Define this function if you want to know when a feature is + * {Function} Define this function if you want to know when a feature is * done dragging. The function should expect to receive two arguments: * the feature that is being dragged and the pixel location of the * mouse. @@ -285,9 +273,6 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { downFeature: function(pixel) { this.lastPixel = pixel; this.onStart(this.feature, pixel); - return this.layer.events.triggerEvent( - "beforefeaturemodified", {feature: this.feature} - ); }, /** @@ -305,8 +290,6 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { this.layer.drawFeature(this.feature); this.lastPixel = pixel; this.onDrag(this.feature, pixel); - this.layer.events.triggerEvent("featuremodified", - {feature: this.feature}); }, /** @@ -332,9 +315,6 @@ OpenLayers.Control.DragFeature = OpenLayers.Class(OpenLayers.Control, { */ doneDragging: function(pixel) { this.onComplete(this.feature, pixel); - this.layer.events.triggerEvent("afterfeaturemodified", { - feature: this.feature - }); }, /** diff --git a/tests/Control/DragFeature.html b/tests/Control/DragFeature.html index 03496eea4f..cfc3a631f4 100644 --- a/tests/Control/DragFeature.html +++ b/tests/Control/DragFeature.html @@ -168,13 +168,9 @@ } function test_Control_DragFeature_move(t) { - t.plan(5); + t.plan(3); var map = new OpenLayers.Map("map"); var layer = new OpenLayers.Layer.Vector(); - layer.events.on({ - 'beforefeaturemodified': function(evt) { t.ok(true, "beforefeaturemodified is triggered on the layer"); }, - 'featuremodified': function(evt) { t.ok(true, "featuremodified is triggered on the layer"); } - }); map.addLayer(layer); var control = new OpenLayers.Control.DragFeature(layer); map.addControl(control); @@ -261,13 +257,10 @@ } function test_Control_DragFeature_done(t) { - t.plan(3); + t.plan(2); var map = new OpenLayers.Map("map"); var layer = new OpenLayers.Layer.Vector(); map.addLayer(layer); - layer.events.on({ - 'afterfeaturemodified': function(evt) { t.ok(true, "afterfeaturemodified is triggered on the layer"); } - }); var control = new OpenLayers.Control.DragFeature(layer); map.addControl(control);