hooch 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168d4128131eb0aaefe037ae38a2b7a4cbf8274f73d294bb2b891e9f879425ab
-  data.tar.gz: bdd68a50fedff639930c316bbbd7dc1fd1d024dd034416b7007fbfef6310c745
+  metadata.gz: 78480ee426a832313d8a0a6e84d4c2b9f6ed0ce0216720028ca15bd192846de4
+  data.tar.gz: 9e3cdd66fad8bd4a296b05fbb0d29490ff685664c3e7c75b5f77e0636d6e25a7
 SHA512:
-  metadata.gz: f2b36a4cb2e43b8058f08189464e5d76ab2ff53597744438091e8b683bdbb2411b5c6c374fd87db7bf48ae7666bcf14dc73904d0b114d2eb86813c2fc8adce43
-  data.tar.gz: 2ddd5eefa06924f24d86439e16e7fc5a9af6a20bdaa4b683abab8867d132bf4e7c76d564a88bfbe5080b1749f88c9243be56299df3f0374941ec1fae62cf3aa2
+  metadata.gz: cbbebdaf8ca8a714e818382d32db61a66172c5427c2c1a37086779df11cbfe955f7459ba83085bee7509ef2a787a6a71ad4f10235759346a7ffa830c41723ddb
+  data.tar.gz: 777045c9603eaeace7bb9c26e241cc2d9cc47954d66d25f00060f1b7061a18d96fa5367795208c3a0c1d3e14f2c1cb6ac861213c153f64a5e28963840a3d5052

data/app/assets/javascripts/hooch.js

@@ -234,6 +234,7 @@ var initHooch = function(){
         this.disableScroll()
         this.$modal_content.trigger('modalInitialized')
         this.$modal_mask.show()
+        hooch.current_modal = this
         this.$modal_content.trigger('modalVisible')
       },
       getMask: function(){
@@ -245,14 +246,12 @@ var initHooch = function(){
         this.$modal_content.show()
       },
       getDismisser: function(){
-        if(this.dismissable){
-          this.$dismisser = this.$modal_mask.find('#hooch-dismiss')        
-        }
+        this.$dismisser = this.$modal_mask.find('#hooch-dismiss')        
+        this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
       },
       attachDismisser: function(){
         if(this.dismissable){
           this.$modal_wrapper.append(this.$dismisser)
-          this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
         }
       },
       close: function(){
@@ -276,11 +275,33 @@ var initHooch = function(){
         hooch.dismisser.dismissModal()
       }
     },
+    attachModalDismisser: function(){
+      if(hooch.current_modal){
+        hooch.current_modal.dismissable = true
+        hooch.current_modal.attachDismisser()
+      }
+    },
     ModalNow: Class.extend({
       init: function($modal_trigger){
         this.$modal_content = $($modal_trigger.data('content-target'))
+        this.delay = $modal_trigger.data('delay')
         this.dismissable = $modal_trigger.data('dismissable')
-        new hooch.Modal(this.$modal_content, this.dismissable)
+        var modal_now = this
+        if(this.delay > 0){
+          setTimeout(function(){new hooch.Modal(modal_now.$modal_content, modal_now.dismissable)}, delay)
+        } else {
+          new hooch.Modal(this.$modal_content, this.dismissable)
+        }
+      }
+    }),
+    ModalCloser: Class.extend({
+      init: function($modal_closer){
+        var milliseconds = $modal_closer.data('milliseconds')
+        if(milliseconds > 0){
+          setTimeout(function(){hooch.closeModal()},milliseconds)
+        } else {
+          hooch.closeModal()
+        }
       }
     }),
     Expandable: Class.extend({
@@ -2286,7 +2307,7 @@ var initHooch = function(){
       ['hover_overflow','hidey_button','hide-show','submit-proxy','click-proxy','field-filler','revealer',
         'checkbox-hidden-proxy','prevent-double-submit','prevent-double-link-click', 'tab-group',
         'hover-reveal', 'emptier', 'remover', 'checkbox-proxy', 'fake-checkbox', 'fake-select', 'select-action-changer',
-        'sorter', 'sort-element', 'bind-key','modal-trigger','modal-now','history-pusher', 'history-replacer', 'link', 'atarget',
+        'sorter', 'sort-element', 'bind-key','modal-trigger','modal-now','modal-closer','history-pusher', 'history-replacer', 'link', 'atarget',
         'page-reloader'],'hooch');
     window.any_time_manager.load();
   };

data/lib/hooch/hooch_helper.rb

@@ -40,13 +40,20 @@ module Hooch
       attrs
     end
 
-    def modal_now(target, dismissable: true)
+    def modal_now(target, dismissable: true, delay: 0)
       attrs = 'data-modal-now=true'
       attrs += " data-content-target=#{target}"
+      attrs += " data-delay=#{delay}"
       attrs += " data-dismissable=true" if dismissable
       attrs
     end
 
+    def modal_closer(milliseconds: 0)
+      attrs = 'data-modal-closer=true'
+      attrs += " data-milliseconds=#{milliseconds}"
+      attrs
+    end
+
     def hide_show(target, any_click_closes: false)
       {}.tap do |params|
         params['data-hide-show'] = true

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.16.0"
+  VERSION = "0.16.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-21 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails