CreateBreak disable & dialog close bugs

UMN-LATIS · Jan 23, 2024 · 3a7a095 · 3a7a095
1 parent cd6e5d4
commit 3a7a095
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/Leaflet.DataAccess.js b/Leaflet.DataAccess.js
@@ -49,7 +49,7 @@ function ViewData(Inte) {
 
     ViewData.prototype.disable = function() {
         this.btn.state('inactive');
-        // this.active = false;
+        this.active = false;
         Inte.viewDataDialog.close();
     }
 }
@@ -103,13 +103,6 @@ function ViewDataDialog(Inte) {
     }).addTo(Inte.treering.viewer);
     this.dialog.hideClose();
 
-    // $(this.dialog._map).on('dialog:closed', (event) => { 
-    //     console.log(this.dialog)
-    //     Inte.viewData.btn.state('inactive'); 
-    //     Inte.viewData.active = false;
-    //     if (Inte.deleteData?.dialog) Inte.deleteData.dialog.close();
-    // });
-
     this.scrollPositionFromTop = 0;
 
     /**

diff --git a/Template.AreaCapture.html b/Template.AreaCapture.html
@@ -175,7 +175,7 @@ <h3>
     <h4 class="AreaCapture-lassoInstruction-header">Selecting ellipses to delete or re-date:</h4>
     <p class="AreaCapture-lassoInstruction-text">Use the lasso tool to click, drag, and encircle existing ellipses in order to delete or change calendar year dating. When selected, ellipses appear as yellow.</p>
     <p class="AreaCapture-lassoInstruction-text">Deselect ellipses by using the lasso tool again.</p>
-    <p class="AreaCapture-lassoInstruction-text"><b>Use ESC or Right-Click to disable lasso tool.</b></p>
+    <p class="AreaCapture-lassoInstruction-text"><b>Use Right-Click to disable lasso tool.</b></p>
 
     <div class="AreaCapture-lasso-toggle">
         <label><input type="checkbox" id="AreaCapture-lasso-btn"><span>Do not show message again.</span></label>

diff --git a/_site/leaflet-treering.js b/_site/leaflet-treering.js
@@ -202,7 +202,7 @@ function LTreering (viewer, basePath, options, base_layer, gl_layer) {
     // Disable all tools w/ esc.
     L.DomEvent.on(window, 'keydown', (e) => {
        if (e.keyCode == 27) {
-         this.disableTools();
+          this.disableTools();
        }
     }, this);
 
@@ -3792,7 +3792,7 @@ function CreateBreak(Lt) {
       this.enable();
       Lt.mouseLine.from(Lt.data.points[Lt.data.index - 1].latLng);
     },
-    () => { this.disable }
+    () => { this.disable() }
   );
 
   L.DomEvent.on(window, 'keydown', (e) => {
@@ -5084,7 +5084,7 @@ function Helper(Lt) {
       document.getElementById("shift-radioB").checked = !Lt[tool].adjustOuter;
 
       $(this.dialog._map).on("dialog:resizeend", () => { console.log(this.dialog) });
-      $(this.dialog._map).on("dialog:closed", () => {
+      $(this.dialog._closeNode).on("click", (e) => {
         if (this.dialog) {
           // Only have user select adjustment once per activation.
           Lt[tool].selectedAdjustment = true;

diff --git a/leaflet-treering.js b/leaflet-treering.js
@@ -202,7 +202,7 @@ function LTreering (viewer, basePath, options, base_layer, gl_layer) {
     // Disable all tools w/ esc.
     L.DomEvent.on(window, 'keydown', (e) => {
        if (e.keyCode == 27) {
-         this.disableTools();
+          this.disableTools();
        }
     }, this);
 
@@ -3792,7 +3792,7 @@ function CreateBreak(Lt) {
       this.enable();
       Lt.mouseLine.from(Lt.data.points[Lt.data.index - 1].latLng);
     },
-    () => { this.disable }
+    () => { this.disable() }
   );
 
   L.DomEvent.on(window, 'keydown', (e) => {
@@ -5084,7 +5084,7 @@ function Helper(Lt) {
       document.getElementById("shift-radioB").checked = !Lt[tool].adjustOuter;
 
       $(this.dialog._map).on("dialog:resizeend", () => { console.log(this.dialog) });
-      $(this.dialog._map).on("dialog:closed", () => {
+      $(this.dialog._closeNode).on("click", (e) => {
         if (this.dialog) {
           // Only have user select adjustment once per activation.
           Lt[tool].selectedAdjustment = true;