Merge pull request #4698 from adube/793-fix-edit-modal

793 - Fix GMF edit feature stop editing while dirty
camptocamp · Feb 28, 2019 · e4045ad · e4045ad
2 parents a5f196f + 05e5908
commit e4045ad
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/contribs/gmf/src/editing/editFeatureComponent.js b/contribs/gmf/src/editing/editFeatureComponent.js
@@ -603,13 +603,27 @@ Controller.prototype.$onInit = function() {
     (newValue, oldValue) => {
       const state = EditingState;
       if (newValue === state.STOP_EDITING_PENDING) {
-        this.confirmCancel().then(() => {
+        if (this.feature && this.dirty) {
+          this.confirmCancel().then(() => {
+            this.timeout_(() => {
+              this.state = state.STOP_EDITING_EXECUTE;
+              this.scope_.$apply();
+            }, 500);
+          });
+        } else {
           this.state = state.STOP_EDITING_EXECUTE;
-        });
+        }
       } else if (newValue === state.DEACTIVATE_PENDING) {
-        this.confirmCancel().then(() => {
+        if (this.feature && this.dirty) {
+          this.confirmCancel().then(() => {
+            this.timeout_(() => {
+              this.state = state.DEACTIVATE_EXECUTE;
+              this.scope_.$apply();
+            }, 500);
+          });
+        } else {
           this.state = state.DEACTIVATE_EXECUTE;
-        });
+        }
       }
     }
   );