hooch 0.15.28 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 80e821495ee340295061de36934b091e3c63384d
-  data.tar.gz: 6ac403256b2d90584da8e2a0dc2a0c8904cb0894
+SHA256:
+  metadata.gz: 168d4128131eb0aaefe037ae38a2b7a4cbf8274f73d294bb2b891e9f879425ab
+  data.tar.gz: bdd68a50fedff639930c316bbbd7dc1fd1d024dd034416b7007fbfef6310c745
 SHA512:
-  metadata.gz: 328cc9598f39273edc2683f4a642c4f47e3dbd520b2ddff7efac8053e34b59c06b764ca2957e279af2a48112d6e04a990f73fe6eca184a77e0334866c5a10441
-  data.tar.gz: 63cfc1a46b10ba1638c3b80b4cb02296854b59122a94404c9daded3d3ed806898d87fd6700e2f9481325468eea70db188edde2bed97a225a9105a17bca9f9473
+  metadata.gz: f2b36a4cb2e43b8058f08189464e5d76ab2ff53597744438091e8b683bdbb2411b5c6c374fd87db7bf48ae7666bcf14dc73904d0b114d2eb86813c2fc8adce43
+  data.tar.gz: 2ddd5eefa06924f24d86439e16e7fc5a9af6a20bdaa4b683abab8867d132bf4e7c76d564a88bfbe5080b1749f88c9243be56299df3f0374941ec1fae62cf3aa2

data/app/assets/javascripts/hooch.js

@@ -187,10 +187,11 @@ var initHooch = function(){
       init: function($modal_trigger){
         this.$modal_trigger = $modal_trigger
         this.$modal_content = $($modal_trigger.data('content-target'))
+        this.dismissable = $modal_trigger.data('dismissable')
         var modal_trigger = this
         $modal_trigger.on('click', function(){
           modal_trigger.instantiate('before')
-          new hooch.Modal(modal_trigger.$modal_content)
+          new hooch.Modal(modal_trigger.$modal_content, this.dismissable)
           modal_trigger.instantiate('after')
         })
       },
@@ -223,8 +224,9 @@ var initHooch = function(){
       }
     }),
     Modal: Class.extend({
-      init: function($modal_content){
+      init: function($modal_content,dismissable){
         this.$modal_content = $modal_content
+        this.dismissable = dismissable
         this.getMask()
         this.getDismisser()
         this.getContentWrapper()
@@ -235,27 +237,23 @@ var initHooch = function(){
         this.$modal_content.trigger('modalVisible')
       },
       getMask: function(){
-        this.mask_top = $(window).scrollTop()
-        this.mask_height = $(window).height()
         this.$modal_mask = $('#hooch-mask')
-        this.$modal_mask.css({height: this.mask_height + 'px', top: this.mask_top + 'px',
-          position: 'absolute', 'z-index': 100000,
-          left: 0, right: 0, bottom: 0
-        })
       },
       getContentWrapper: function(){
         this.$modal_wrapper = this.$modal_mask.find('#hooch-modal')
-        this.$modal_element = $('<div/>', {id: 'hooch_content', style: 'position: relative; float: left; height: ' + (this.mask_height - 100) + 'px;'})
-        this.$modal_wrapper.html(this.$modal_element)
-        this.$modal_element.html(this.$modal_content)
+        this.$modal_wrapper.html(this.$modal_content)
         this.$modal_content.show()
       },
       getDismisser: function(){
-        this.$dismisser = this.$modal_mask.find('#hooch-dismiss')
+        if(this.dismissable){
+          this.$dismisser = this.$modal_mask.find('#hooch-dismiss')        
+        }
       },
       attachDismisser: function(){
-        this.$modal_wrapper.append(this.$dismisser)
-        this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
+        if(this.dismissable){
+          this.$modal_wrapper.append(this.$dismisser)
+          this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
+        }
       },
       close: function(){
         this.$modal_mask.hide()
@@ -278,6 +276,13 @@ var initHooch = function(){
         hooch.dismisser.dismissModal()
       }
     },
+    ModalNow: Class.extend({
+      init: function($modal_trigger){
+        this.$modal_content = $($modal_trigger.data('content-target'))
+        this.dismissable = $modal_trigger.data('dismissable')
+        new hooch.Modal(this.$modal_content, this.dismissable)
+      }
+    }),
     Expandable: Class.extend({
       init: function($expandable){
         var expandable = this;
@@ -930,7 +935,7 @@ var initHooch = function(){
     }),
     ReloadPage: Class.extend({
       init: function(reload_page){
-        window.location.href = reload_page;
+        window.location.assign(reload_page);
       }
     }),
     PageReloader: Class.extend({
@@ -2281,7 +2286,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','history-pusher', 'history-replacer', 'link', 'atarget',
+        'sorter', 'sort-element', 'bind-key','modal-trigger','modal-now','history-pusher', 'history-replacer', 'link', 'atarget',
         'page-reloader'],'hooch');
     window.any_time_manager.load();
   };

data/lib/hooch/hooch_helper.rb

@@ -33,9 +33,18 @@ module Hooch
       attrs = 'data-tab-id=' + id
     end
 
-    def modal_trigger(target)
+    def modal_trigger(target, dismissable: true)
       attrs = 'data-modal-trigger=true'
       attrs += " data-content-target=#{target}"
+      attrs += " data-dismissable=true" if dismissable
+      attrs
+    end
+
+    def modal_now(target, dismissable: true)
+      attrs = 'data-modal-now=true'
+      attrs += " data-content-target=#{target}"
+      attrs += " data-dismissable=true" if dismissable
+      attrs
     end
 
     def hide_show(target, any_click_closes: false)

data/lib/hooch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.15.28
+  version: 0.16.0
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tools for building a browser UI. Get the good stuff.