hooch 0.14.7 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e796b59257a37fb263c448e9ee2ad8727f0a2876
-  data.tar.gz: 54caf3505ce63a22068c91a960d743a46a922715
+  metadata.gz: 230ed67a149ea37899dd8a89764b3007121ca1b9
+  data.tar.gz: 11b0cff64e48340b953966e505177e8b4b71e64c
 SHA512:
-  metadata.gz: c0c55ada1df470d60fe21b45d4be586f8c45ccc69850bb2bb954e7fdaa57097581340a6e6a8812d706e605044bc386000b7cf2f5064360c95880d58acf633677
-  data.tar.gz: 339dee853aedd515838d1421cecc933ca223512077d533d7f9aacf233a078e13ff7c0f2893a51fae8b4e2493324d87a10fe4ffa213b33abc4d41050d99599b6c
+  metadata.gz: a238a84393f6d90a38f8f4dc065102f59546ce347493d27cdd9b99a6a796b75fb1c9978cd33019a92315af088053e28bebff27810a370ec6bae0b1ce4c008dc0
+  data.tar.gz: f3b39a65b6b428cb6a8a19a940ab9d15ec76b6be853cadb75d5d231c44301dbd815d27f298c6057e9e833f7b50bef958fee3371990dae9bd8b9d4339acfb3b2e

data/app/assets/javascripts/hooch.js

@@ -113,7 +113,7 @@ var initHooch = function(){
         this.$modal_content = $($modal_trigger.data('content-target'))
         var modal_trigger = this
         $modal_trigger.on('click', function(){
-          new hooch.Modal(modal_trigger.$modal_content.html())
+          new hooch.Modal(modal_trigger.$modal_content)
         })
       }
     }),
@@ -130,56 +130,38 @@ var initHooch = function(){
     Modal: Class.extend({
       init: function($modal_content){
         this.$modal_content = $modal_content
-        this.setGeometry()
         this.getMask()
-        this.getModal()
         this.getDismisser()
         this.getContentWrapper()
         this.disableScroll()
+        this.$modal_content.trigger('modalInitialized')
         this.$modal_mask.show()
+        this.$modal_content.trigger('modalVisible')
       },
-      setGeometry: function(){
-        this.margin = 30;
-        this.padding = 30;
+      getMask: function(){
         this.mask_top = $(window).scrollTop()
         this.mask_height = $(window).height()
-        this.modal_height = this.mask_height - (this.margin*2)
-      },
-      getMask: function(){
         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,
-          'background-color': 'rgba(0,0,0,0.5)'
+          left: 0, right: 0, bottom: 0
         })
       },
-      getModal: function(){
-        this.$modal_element = this.$modal_mask.find('#hooch-modal')
-        this.$modal_element.css({'max-height': this.modal_height,
-          'margin-top': this.margin, 'margin-bottom': this.margin,
-          'padding-bottom': this.padding, 'padding-left': this.padding, 'padding-right': this.padding,
-          position: 'relative', float: 'left', 'margin-left': '50%',
-          '-webkit-transform': 'translateX(-50%)',
-          '-moz-transform': 'translateX(-50%)',
-          '-ms-transform': 'translateX(-50%)',
-          '-o-transform': 'translateX(-50%)',
-          transform: 'translateX(-50%)'})
-      },
       getContentWrapper: function(){
-        this.$modal_content_wrapper = this.$modal_element.find('#hooch-content')
-        var content_height = this.modal_height - (this.padding*2)
-        this.$modal_content_wrapper.css({'overflow-y': 'scroll', 'max-height': content_height, position: 'relative', float: 'left'})
-        this.$modal_content_wrapper.html(this.$modal_content)
+        this.$modal_element = this.$modal_mask.find('#hooch-modal')
+        this.$modal_element.append(this.$modal_content)
+        this.$modal_content.show()
       },
       getDismisser: function(){
         this.$dismisser = this.$modal_mask.find('#hooch-dismiss')
-        this.$dismisser.css({position: 'relative', float: 'right', 'font-size': '22px', 'line-height': '30px'})
         this.dismisser = new hooch.ModalDismisser(this.$dismisser,this)
+        this.$modal_content.append(this.$dismisser)
       },
       close: function(){
         this.$modal_mask.hide()
-        this.$modal_content_wrapper.empty()
+        this.$modal_content.hide()
         this.enableScroll()
+        this.$modal_content.trigger('modalClosed')
       },
       disableScroll: function(){
         var modal = this
@@ -921,33 +903,17 @@ var initHooch = function(){
     }),
     FakeSelect: Class.extend({
       init: function($fake_select){
-        this.all_options    = []
         this.select_display = $fake_select.find('[data-select-display]')
         this.real_select = $fake_select.find('input')
         var fake_select = this
         $fake_select.find('[data-select-value][data-select-name]').each(function(){
-          fake_select.all_options.push(new hooch.FakeOption($(this), fake_select));
+          new hooch.FakeOption($(this),fake_select)
         })
-        if(this.real_select.val() != "" && typeof(this.real_select.val()) != "undefined"){
-          this.initial_select(this.findOptionForValue(this.real_select.val()));
-        }
       },
-      initial_select: function(fake_option){
+      select: function(fake_option){
         this.select_display.html(fake_option.select_name);
         this.real_select.val(fake_option.select_value);
-      },
-      select: function(fake_option){
-        this.initial_select(fake_option);
         this.select_display.trigger('click');
-      },
-      findOptionForValue: function(value){
-        var selected_option
-        $.each(this.all_options, function(i, option){
-          if(option.select_value == value){
-            selected_option = option
-          }
-        });
-        return selected_option;
       }
     }),
     FakeOption: Class.extend({
@@ -956,7 +922,7 @@ var initHooch = function(){
         this.select_name  = $fake_option.data('select-name')
         this.$fake_option = $fake_option
         var fake_option = this
-        $fake_option.on('click', function(){
+        $fake_option.on('click',function(){
           $fake_select.select(fake_option)
         })
       }
@@ -1623,22 +1589,33 @@ var initHooch = function(){
   });
   hooch.FakeSelectRevealer = hooch.Revealer.extend({
     init: function($fake_select){
-      this.fake_select = new hooch.FakeSelect($fake_select)
+      this.select_display = $fake_select.find('[data-select-display]')
+      this.real_select = $fake_select.find('input')
+      var fake_select = this
+      this.select_options = []
+      $fake_select.find('[data-select-value][data-select-name]').each(function(){
+        fake_select.select_options.push(new hooch.FakeOption($(this), fake_select));
+      })
       this.children_id        = $fake_select.data('revealer-children-id');
       this.highlander         = $fake_select.data('revealer-highlander');
       this.$revelation_target = $('[data-revealer-target="' + this.children_id + '"]');
       this._super($fake_select);
     },
+    select: function(fake_option){
+      this.select_display.html(fake_option.select_name);
+      this.real_select.val(fake_option.select_value);
+      this.select_display.trigger('click');
+    },
     bindEvent: function(){
       var revealer = this;
-      $.each(this.fake_select.all_options, function(){
+      $.each(this.select_options, function(){
         this.$fake_option.bind('click', function(){
           revealer.reveal();
         })
       })
     },
     reveal: function(){
-      var sanitized_value = this.fake_select.real_select.val()
+      var sanitized_value = this.real_select.val()
       if('true' == sanitized_value){ sanitized_value = true }
       if('false' == sanitized_value){ sanitized_value = false }
       this.$children = [];
@@ -1664,9 +1641,6 @@ var initHooch = function(){
       this.hideChildren();
       this.revealChosenOnes();
     },
-    getSanitizedValue: function(){
-      return this.real_select.val();
-    },
     hideChildren: function(){
       this._super();
       if (this.highlander){

data/lib/hooch/hooch_helper.rb

@@ -25,8 +25,8 @@ module Hooch
     end
 
     def modal_trigger(target)
-      attrs = 'data-modal-trigger="true"'
-      attrs += " data-content-target=\"#{target}\""
+      attrs = 'data-modal-trigger=true'
+      attrs += " data-content-target=#{target}"
     end
 
     def hide_show(target, any_click_closes: false)

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.14.7"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.14.7
+  version: 0.15.0
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Tools for building a browser UI. Get the good stuff.