hooch 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 452e37dc668ff73f2176e935edc337fb1d39fc40
-  data.tar.gz: fd342beba6379e2e8011434084e836931dba0047
+  metadata.gz: 52c149faace46de6b5c09101da5c55b29a6dfe9e
+  data.tar.gz: 0fdc3af73d3dc87c8627e219b9ab43bfb6d02442
 SHA512:
-  metadata.gz: e249d34c18a953a8332f86b7474119e6c2b40a1988f964d9f51c1d4d0e573526e3118dd8a31238d04c6cbbb7bfd10f95e7c00d28fdf8e56d8fcf00a2b9c5910f
-  data.tar.gz: 9f650265a8f72416b1ec86151d9069cd2aded9ef451d7268b4ba6bb508ae361714b0ea1b9e37885fe3aebdea2759353182fd440b3087508cdb45fa2b2fc13e7c
+  metadata.gz: 01b12c2623fb4f008c561dbfe14d2af46b3b16467e1a87b9ac3a84911450e053b5cc90709ba560b796c158be943e8ea12e683679f51f293ad4835c3192c3bd06
+  data.tar.gz: 27662733491a9211d5e6093fd0363db0c9cc08e200ab706187d5ad68aea5b72cf9657f4a2d83bf64d54c49155eb0bbff9e03a475c9d9ad4bcf73b52bcb98c904

data/README.md

@@ -1,6 +1,6 @@
-# Hooch
+[![Build Status](https://semaphoreci.com/api/v1/invitedhome/hooch/branches/master/badge.svg)](https://semaphoreci.com/invitedhome/hooch)
 
-TODO: Write a gem description
+# Hooch
 
 ## Installation
 
@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+See the [Wiki](https://github.com/edraut/hooch/wiki)
 
 ## Contributing
 

data/app/assets/javascripts/hooch.js

@@ -443,6 +443,7 @@ var initHooch = function(){
     TabGroup: Class.extend({
       init: function($tab_group){
         this.$tab_group = $tab_group;
+        this.getStateBehavior();
         this.getName();
         this.tab_triggers = [];
         this.tab_triggers_by_id = {};
@@ -477,9 +478,10 @@ var initHooch = function(){
         this.$content_parent = this.tab_triggers[0].getParent();
       },
       handleDefault: function(){
+
         if(this.$tab_group.data('default-tab')){
           this.default_tab = this.tab_triggers_by_id[this.$tab_group.data('default-tab')];
-          this.default_tab.toggleTarget('replace');
+          this.default_tab.toggleTarget(this.state_behavior);
         }
       },
       hideAll: function(trigger){
@@ -510,12 +512,20 @@ var initHooch = function(){
       },
       getActiveTab: function(){
         return this.active_tab;
+      },
+      getStateBehavior: function(){
+        if(this.$tab_group.data('no-history')){
+          this.state_behavior = 'no history'
+        } else {
+          this.state_behavior = 'replace'
+        }
       }
     }),
     TabTrigger: Class.extend({
       init: function($tab_trigger,tab_group){
         this.$tab_trigger = $tab_trigger;
         this.tab_group = tab_group;
+        this.state_behavior = this.tab_group.state_behavior
         this.tab_group_name = tab_group.name;
         this.tab_id = $tab_trigger.data('tab-target-id');
         this.getPushState();
@@ -536,20 +546,22 @@ var initHooch = function(){
           this.push_state = this.$tab_trigger.data('push-state')
         }
       },
-      toggleTarget: function(state_behavior){
+      toggleTarget: function(requested_state_behavior){
         var was_visible = this.$target.is(':visible');
         if(!was_visible){
           this.tab_group.setActiveTab(this);
           this.resize();
           var change_history = true;
           var history_method = 'pushState'
-          if('no history' == state_behavior){
+          if('no history' == requested_state_behavior || 'no history' == this.state_behavior){
             change_history = false
-          } else if('replace' == state_behavior){
+          } else if('replace' == requested_state_behavior){
             history_method = 'replaceState'
           }
           if (this.push_state && change_history) {
-            var current_state = new hooch.IhHistoryState(history.state)
+            var current_query = jQuery.extend(true, {}, hooch.beginning_params);
+            current_query = jQuery.extend(true, current_query, history.state);
+            var current_state = new hooch.IhHistoryState(current_query)
             current_state.addState(this.tab_group_name, this.push_state);
             history[history_method](current_state.state, null, current_state.toUrl());
           }
@@ -1787,6 +1799,21 @@ var initHooch = function(){
     e.cancelBubble=true;
     e.returnValue=false;
   }
+
+  //https://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
+  hooch.beginning_params = (function(a) {
+    if (a == "") return {};
+    var b = {};
+    for (var i = 0; i < a.length; ++i)
+    {
+        var p=a[i].split('=', 2);
+        if (p.length == 1)
+            b[p[0]] = "";
+        else
+            b[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
+    }
+    return b;
+  })(window.location.search.substr(1).split('&'));
   $.fn.findExclude = function( selector, mask, result )
   {
       result = typeof result !== 'undefined' ? result : new jQuery();

data/lib/hooch/hooch_helper.rb

@@ -1,12 +1,13 @@
 module Hooch
   module HoochHelper
-    def tab_set(name, type: nil, default_tab: nil)
+    def tab_set(name, type: nil, default_tab: nil, no_history: nil)
       if :ajax == type
         type = 'AjaxTabGroup'
       end
       attrs = 'data-tab-group=' + name
       attrs += ' data-sub-type=' + type if type.present?
       attrs += ' data-default-tab=' + default_tab if default_tab.present?
+      attrs += ' data-no-history=true' if no_history.present?
       attrs
     end
 

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails