turbo_modal 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 109ad54770b4ca4dbf21878bc8c71b8cf26ab1419b94428c9b5e2f6f3039d6f6
-  data.tar.gz: 53074315c672b7872ddf00f7eb450ea1f211258ec846afd885e43867e80cd6fd
+  metadata.gz: 1784474a3a799b2c623b1705a5cf0df011bd809287a81342ceb605fc29930ef3
+  data.tar.gz: 733288280786b1cd6c8463db2351101fbfe7e668f05ac4e0f6367a4309c8b438
 SHA512:
-  metadata.gz: c8b80f44d4a426e6b22e781c3b602c8a93b4e713e83ad5d19f2811fbdda5fb51534cc7e01a8fb708dece3dc8e1884f3c79b6bd56528f46a86875c48ef5bdd28b
-  data.tar.gz: b70024cf95327a99d3efe987c1f446031fb2b35e233f993a5cb7e8c35be851b7607fd47c9e2633d01d0f85f27bbde6dae6456ff7bf427f61368fefb53f57b9d9
+  metadata.gz: 28206680aa24756513e5e593cc601cb55b56642b56d67ff826ffff8e55dd7dcaa23904e36aa7c74c1b40a22b2451bbf2edcfb4118766b9a2dab97d37549cbb46
+  data.tar.gz: fddf55d488c5a7f3b1e9953550c9b054cf47e42c0895ea342a2f9d6ffd6cef947a2037532d45d941012e7d689030ddb6a2288ef9e58a292b1196c41c1b4b38ba

data/app/javascript/turbo_modal/modal_controller.js

@@ -19,6 +19,9 @@ class ModalController extends Controller {
   open(e) {
     this.turboFrameTarget.src = e.detail.url;
     this.typeValue = e.detail.type;
+    if (event.detail.dismissable) {
+      this.turboFrameTarget.dataset.dismissable = "";
+    }
     showScrim(e.detail.dismiss);
   }
 
@@ -31,6 +34,7 @@ class ModalController extends Controller {
     setTimeout(() => {
       modal_element.remove();
       this.turboFrameTarget.src = null;
+      delete this.turboFrameTarget.dataset.dismissable;
 
       if (this.typeValue !== "") {
         this.turboFrameTarget.classList.remove(this.typeValue);
@@ -41,7 +45,7 @@ class ModalController extends Controller {
   }
 
   keyup(event) {
-    if (event.key === "Escape") {
+    if (event.key === "Escape" && this.turboFrameTarget.dataset.dismissable === "") {
       closeModal();
     }
   }

data/app/javascript/turbo_modal/scrim_controller.js

@@ -28,7 +28,7 @@ class ScrimController extends Controller {
   }
 
   onClick(event) {
-    if (this.scrimTarget.dataset.dismissable) {
+    if (this.scrimTarget.dataset.dismissable === "") {
       window.dispatchEvent(new Event("scrim:hide"));
     }
   }

data/lib/turbo_modal/version.rb

@@ -1,3 +1,3 @@
 module TurboModal
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo_modal
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Alan Cornthwaite
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails