hooch 0.15.21 → 0.15.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b236356d057d3d944f5a436b88a96d0eb584def4
-  data.tar.gz: bedf9af809a0508cd18213bcdb2dd8b0d3321270
+  metadata.gz: 584beed1dc2f45bd0862a5d09c496f3e3642943d
+  data.tar.gz: fda6ef758f27d76e3daf3658e8c206d7f54f7e47
 SHA512:
-  metadata.gz: bd444bb4c4bba0a12508c10bbdde0516c845bc1612d2785fdb4970413e053d28d678ce37d6ed20a185a327d7862cadcc26e6e192eab0a1edba0e26f0c9c8c346
-  data.tar.gz: 8eae97ff94827075d414f6bc4daafb5e0d49b21fc06bd59ec918f777b677ed7baf2ba29f2f4e40372ce78d8ead2602166a1aaedb18050f8c2996df58687f039f
+  metadata.gz: e585b419dd96204b169656a5667972eaa2c0bd07440f7cf09b1edd7b3e26f8332ebb5a96ae3590f4271846bdd36c97e74b652f3205c9c03803fe60622ff0bf4c
+  data.tar.gz: 8efd12a6aa93bdac04c49d8c127009522b5f68ae36498584c3219ea3ffe3c5a1e08e96d93192a97af3187e508fa4239b7af7669c70bd5d930835a90880667721

data/app/assets/javascripts/hooch.js

@@ -245,7 +245,7 @@ var initHooch = function(){
       },
       getContentWrapper: function(){
         this.$modal_wrapper = this.$modal_mask.find('#hooch-modal')
-        this.$modal_element = $('<div/>', {id: 'hooch_content', style: 'position: relative; float: left;'})
+        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_content.show()
@@ -268,34 +268,9 @@ var initHooch = function(){
         modal.old_height = $('body')[0].style.height
         modal.old_overflow = $('body')[0].style.overflow
         $('body').css({height: '100%',overflow: 'hidden'})
-        $('body').on({
-          'mousewheel.hoochModalScroll DOMMouseScroll.hoochModalScroll': function(e) {
-            if(($(e.target).attr('id') == 'hooch-content') || ($(e.target).parents('#hooch-content').length > 0)){
-              var delta = e.originalEvent.wheelDelta
-              new_scrolltop = $('#hooch-content').scrollTop() - delta
-              $('#hooch-content').scrollTop(new_scrolltop)
-            }
-            e.preventDefault();
-          }
-        })
-        if (window.addEventListener){ // older FF
-          window.addEventListener('DOMMouseScroll', hooch.preventDefault, false)
-        }
-        window.onwheel = hooch.preventDefault; // modern standard
-        window.onmousewheel = document.onmousewheel = hooch.preventDefault; // older browsers, IE
-        window.ontouchmove  = hooch.preventDefault; // mobile
-        document.onkeydown  = hooch.preventDefaultForScrollKeys;
       },
       enableScroll: function(){
         $('body').css({height: this.old_height, overflow: this.old_overflow})
-        $('body').off('.hoochModalScroll')
-        if (window.removeEventListener){
-          window.removeEventListener('DOMMouseScroll', hooch.preventDefault, false);
-        }
-        window.onmousewheel = document.onmousewheel = null;
-        window.onwheel = null;
-        window.ontouchmove = null;
-        document.onkeydown = null;
       }
     }),
     closeModal: function(){

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.15.21"
+  VERSION = "0.15.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.15.21
+  version: 0.15.22
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-13 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails