hooch 0.16.16 → 0.16.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70ea5ba733c415cb5c371af84b1f1655d850752a48f94a5263c4ec5f39fac57
-  data.tar.gz: 87d09af2a4c46a246b7a68c9fbb3a3bb5bab02545b0124b9e782de3e836e12cd
+  metadata.gz: 60f55de30e97bcbc1041b295244daef1ca96baa58b700c4f78bdb1d850f04a47
+  data.tar.gz: 86bedbd24868783f5cf8545ce961b8a5bfe7e3ecd2f3a4b41dbe1af222683ab5
 SHA512:
-  metadata.gz: 30da0adb4324f0584edc35a1ea2c3f2b1dc0289c3ec33b7c4e03943d27eff5195d1f340b809ab2398719d213ae495f72dbbfb2ae3742996ed3220e2c8a9f5164
-  data.tar.gz: 59ea8ba01a1ac73073e1089ed73ec95bae1a39d6276f843ca9f68a4bcd4136f68e17b41aee5907d015ef869ba3da9f15622cd7846bc1691a36ecf93fae9fe982
+  metadata.gz: ffc4bb125afb14cc97fcac9d9aa3be9067db38e533964a8c377e0c0ee54c01be3aceb4bf4afcae344afac8e3e14a19cedc64c414e507ac01a538d3a2b1c16df8
+  data.tar.gz: 2036078fbe86a085b4e46175a656b9b274e0156f9ec9fdb2c676b2fcd36a1947d2c6634768d5e1e283792138aca42f118852736643b62f3cdddc728445ccf274

data/app/assets/javascripts/hooch.js

@@ -220,21 +220,33 @@ var initHooch = function(){
       },
       dismissModal: function(){
         hooch.dismisser = null
-        this.modal.close()
+        hooch.current_modal.close()
       }
     }),
     Modal: Class.extend({
       init: function($modal_content,dismissable){
-        this.$modal_content = $modal_content
-        this.dismissable = dismissable
+        if(!hooch.current_modal){
+          hooch.current_modal = new hooch.SingletonModal()
+        }
+        hooch.current_modal.load($modal_content,dismissable)
+      }
+    }),
+    SingletonModal: Class.extend({
+      init: function($modal_content){
         this.getMask()
-        this.getDismisser()
         this.getContentWrapper()
+        this.getDismisser()
+      },
+      load: function($modal_content,dismissable){
+        this.$modal_content = $modal_content
+        this.dismissable = dismissable        
+        this.$modal_wrapper.html(this.$modal_content)
+        this.$modal_wrapper.append(this.$dismisser)
+        this.$modal_content.show()
         this.attachDismisser()
         this.disableScroll()
         this.$modal_content.trigger('modalInitialized')
         this.showModal()
-        hooch.current_modal = this
         this.$modal_content.trigger('modalVisible')
       },
       getMask: function(){
@@ -242,17 +254,14 @@ var initHooch = function(){
       },
       getContentWrapper: function(){
         this.$modal_wrapper = this.$modal_mask.find('#hooch-modal')
-        this.$modal_wrapper.html(this.$modal_content)
-        this.$modal_content.show()
       },
       getDismisser: function(){
-        this.$dismisser = this.$modal_mask.find('#hooch-dismiss')        
-        this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
+        this.$dismisser = this.$modal_mask.find('#hooch-dismiss')
+        this.$dismisser.on('click', function(){hooch.current_modal.close()})
       },
       attachDismisser: function(){
         if(this.dismissable){
           this.$dismisser.show()
-          this.$modal_wrapper.append(this.$dismisser)
         } else {
           this.$dismisser.hide()
         }
@@ -262,6 +271,7 @@ var initHooch = function(){
         this.$modal_mask.show()
       },
       close: function(){
+        this.$dismisser.detach()
         this.$modal_mask.hide()
         this.$modal_content.hide()
         this.enableScroll()
@@ -288,8 +298,8 @@ var initHooch = function(){
       }
     }),
     closeModal: function(){
-      if(hooch.dismisser){
-        hooch.dismisser.dismissModal()
+      if(hooch.current_modal){
+        hooch.current_modal.close()
       }
     },
     attachModalDismisser: function(){

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.16.16"
+  VERSION = "0.16.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.16.16
+  version: 0.16.18
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails