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

Recover from bad merge conflict resolution in #4036

Browse Source
This commit is contained in:
Andreas Hocevar
2015-10-08 15:18:11 +02:00
parent 21d001b22a
commit dc0c0877d7
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ol/interaction/modifyinteraction.js
View File

@@ -265,8 +265,8 @@ ol.interaction.Modify.prototype.addFeature_ = function(feature) {
ol.interaction.Modify.prototype.willModifyFeatures_ = function(evt) {
if (!this.modified_) {
this.modified_ = true;
this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYSTART,
this.features_, evt));
this.dispatchEvent(new ol.interaction.ModifyEvent(
ol.ModifyEventType.MODIFYSTART, this.features_, evt));
}
};
@@ -678,8 +678,8 @@ ol.interaction.Modify.handleUpEvent_ = function(evt) {
segmentData);
}
if (this.modified_) {
this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYEND,
this.features_, evt));
this.dispatchEvent(new ol.interaction.ModifyEvent(
ol.ModifyEventType.MODIFYEND, this.features_, evt));
this.modified_ = false;
}
return false;
@@ -713,8 +713,8 @@ ol.interaction.Modify.handleEvent = function(mapBrowserEvent) {
'geometry should be an ol.geom.Point');
this.willModifyFeatures_(mapBrowserEvent);
handled = this.removeVertex_();
this.dispatchEvent(new ol.ModifyEvent(ol.ModifyEventType.MODIFYEND,
this.features_, mapBrowserEvent));
this.dispatchEvent(new ol.interaction.ModifyEvent(
ol.ModifyEventType.MODIFYEND, this.features_, mapBrowserEvent));
this.modified_ = false;
} else {
handled = true;