hooch 0.8.5 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82d0a2abc9ab709e76636753bc6d8e9b3cb8167
-  data.tar.gz: 63f04970f34080828d230bafd0eca1188eea8c7a
+  metadata.gz: a170476cbe77cfea18a0cb19690682b6b68b6fb8
+  data.tar.gz: 99ea410d8d7471a265cf4f641feb47a4f2b16136
 SHA512:
-  metadata.gz: 9129a6c7455cc45863d678d4e0136f6ad93c2f5f83d560c4a5db27252bf85d0df0b2e91c8814ae917b78be08126786c85403898352614928d3713ac1c54ab251
-  data.tar.gz: 7fe0002df9d97f2e13cfb919a6fd5b25012d05e40b551b4c108321e1e9f70d68b24d51c31eea5b096259953139348525cbfbdad84c6cf502ab8284d5a119dfe3
+  metadata.gz: 32b1b3c887f907dece42f039a07b84676a8025e2a36614d619494cb1c96217aaa1aba675ec3210a19f3fd5ff289d1a4f0c230848f016b89a97a8b270e097b0e9
+  data.tar.gz: 90a2c9087c8d80a13bcfd2743fa396b1b1cd3ae52344b9366da430c144898bceee548ad1ba0163e53f42d1a2581b8fd5b65578ceeed2bb1dbca2ac4e29c68ade

data/app/assets/javascripts/hooch.js

@@ -627,6 +627,7 @@ var initHooch = function(){
         this.$sorter = $sorter
         $sorter.data('sorter',this)
         this.is_visible = $sorter.is(':visible')
+        this.allow_nested = typeof($sorter.data('allow-nested')) != 'undefined'
         if(this.is_visible){
           this.setWidth();
           this.getSortElements()
@@ -1032,7 +1033,7 @@ var initHooch = function(){
         }
       },
       determineIfSortable: function(){
-        if(this.$sort_element.find('[data-sorter]').length > 0){
+        if(this.$sort_element.find('[data-sorter]').length > 0 && !this.sorter.allow_nested){
           this.sortable = false
         } else {
           this.sortable = true
@@ -1050,7 +1051,7 @@ var initHooch = function(){
         this.pressed = false
       },
       getDragHandle: function(){
-        this.$drag_handle = this.$sort_element.find('[data-drag-handle]')
+        this.$drag_handle = this.$sort_element.findExclude('[data-drag-handle]','[data-sorter]')
         if(this.$drag_handle.length < 1){
           this.$drag_handle = this.$sort_element
         }
@@ -1362,6 +1363,18 @@ var initHooch = function(){
     e.cancelBubble=true;
     e.returnValue=false;
   }
+  $.fn.findExclude = function( selector, mask, result )
+  {
+      result = typeof result !== 'undefined' ? result : new jQuery();
+      this.children().each( function(){
+          thisObject = jQuery( this );
+          if( thisObject.is( selector ) ) 
+              result.push( this );
+          if( !thisObject.is( mask ) )
+              thisObject.findExclude( selector, mask, result );
+      });
+      return result;
+  }
   $(document).ready(function(){
     if(typeof window.any_time_manager === "undefined" && typeof window.loading_any_time_manager === "undefined"){
       window.loading_any_time_manager = true;

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.8.5"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tools for building a browser UI. Get the good stuff.