Fix: exit current editing mode of active poly before enter a new one

alessandrobattisti · Aug 25, 2018 · 66adf64 · 66adf64
1 parent 0bb9331
commit 66adf64
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 12 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.1f97f8c6.css",
   "main.css.map": "static/css/main.1f97f8c6.css.map",
-  "main.js": "static/js/main.b7eb699e.js",
-  "main.js.map": "static/js/main.b7eb699e.js.map"
+  "main.js": "static/js/main.16a3ac7a.js",
+  "main.js.map": "static/js/main.16a3ac7a.js.map"
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Vessel measuring tool</title><link href="./static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.b7eb699e.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Vessel measuring tool</title><link href="./static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.16a3ac7a.js"></script></body></html>
diff --git a/build/static/js/main.b7eb699e.js → build/static/js/main.16a3ac7a.js b/build/static/js/main.b7eb699e.js → build/static/js/main.16a3ac7a.js
diff --git a/build/static/js/main.16a3ac7a.js.map b/build/static/js/main.16a3ac7a.js.map
diff --git a/build/static/js/main.b7eb699e.js.map b/build/static/js/main.b7eb699e.js.map
diff --git a/docs/asset-manifest.json b/docs/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.1f97f8c6.css",
   "main.css.map": "static/css/main.1f97f8c6.css.map",
-  "main.js": "static/js/main.b7eb699e.js",
-  "main.js.map": "static/js/main.b7eb699e.js.map"
+  "main.js": "static/js/main.16a3ac7a.js",
+  "main.js.map": "static/js/main.16a3ac7a.js.map"
 }
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/Vessel-Measuring-Tool/manifest.json"><link rel="shortcut icon" href="/Vessel-Measuring-Tool/favicon.ico"><title>Vessel measuring tool</title><link href="/Vessel-Measuring-Tool/static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/Vessel-Measuring-Tool/static/js/main.b7eb699e.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/Vessel-Measuring-Tool/manifest.json"><link rel="shortcut icon" href="/Vessel-Measuring-Tool/favicon.ico"><title>Vessel measuring tool</title><link href="/Vessel-Measuring-Tool/static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/Vessel-Measuring-Tool/static/js/main.16a3ac7a.js"></script></body></html>
diff --git a/docs/static/js/main.b7eb699e.js → docs/static/js/main.16a3ac7a.js b/docs/static/js/main.b7eb699e.js → docs/static/js/main.16a3ac7a.js
diff --git a/docs/static/js/main.16a3ac7a.js.map b/docs/static/js/main.16a3ac7a.js.map
diff --git a/docs/static/js/main.b7eb699e.js.map b/docs/static/js/main.b7eb699e.js.map
diff --git a/src/Draw.js b/src/Draw.js
@@ -200,6 +200,13 @@ class Draw extends Component {
       poly.el.classList.remove('active')
     })
     if(this.state.active_polyline){
+      //exit all possible editing states of active polyline
+      if(this.state.active_polyline.editing){
+        this.state.active_polyline.stopEditingPoints({code:'Escape'})
+      }
+      if(this.state.active_polyline.breaking_mode){
+        this.exitBreakLineMode({code:'Escape'})
+      }
       this.state.active_polyline.stopEditing({'code':'Escape'})
     }
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Vessel measuring tool</title><link href="./static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.b7eb699e.js"></script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><link rel="shortcut icon" href="./favicon.ico"><title>Vessel measuring tool</title><link href="./static/css/main.1f97f8c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="./static/js/main.16a3ac7a.js"></script></body></html>