hooch 0.15.16 → 0.15.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d39f9cb653059ca6041eaeee003f87306253630c
-  data.tar.gz: 2f1014ebe3d7328b374175affe5b76dc8ba89781
+  metadata.gz: 6f9e1a2069e3af9fcaa50e8499403980a6bf6e6c
+  data.tar.gz: b002417fd825a53c126a23d91f15406fc0de9a57
 SHA512:
-  metadata.gz: b6c6d8c665d7ba52cd2ce8277726ba9bf890b20ec91f3a41c3d855c3ac232c14eff18b29fcc626903eb58792735a9af813c40dacc8d7a80edbe088c6967f4837
-  data.tar.gz: 5b6321eede6a7b603ee6c4e67e29d7a73c9386bf151409b58dc728c1037fd29c785c387fbc19c689f9c9ef53fb6a5d7785f8bcfdfc2f917cab15a9c0ec5eef7d
+  metadata.gz: 5cbf71d663e7a7e5f40fce2ec8bde9295088646dc361451558ab100d8eda2627e6b51b08851209cc28acd1ba4b65eeb5f41fcfc2873c390b0e48d6c18e12cbd8
+  data.tar.gz: 71239cfb4182e1fbcb67f6ec6fb623fea7137982ee806ddcc315faec4afb48140cfbe8c88ea20b8379b315318957c07937b1589026876b776f215bf3a81b2d46

data/app/assets/javascripts/hooch.js

@@ -1082,6 +1082,7 @@ var initHooch = function(){
           this.getSortElements()
         }
         this.getSendSort()
+        this.getRecipientFilters()
         this.startInactivityRefresh()
         var sorter = this
         $(window).on('mouseup touchend touchcancel', function(e){
@@ -1537,17 +1538,22 @@ var initHooch = function(){
         var contains_vertical = this.top_boundary <= point.y && point.y <= this.bottom_boundary
         return contains_horizontal && contains_vertical
       },
+      getRecipientFilters: function(){
+        this.recipient_filters = this.$sorter.data('recipient-filters')
+      },
       matchesFilters: function(element_filters){
-        var recipient_filters = this.$sorter.data('recipient-filters')
+        if(!this.recipient_filters){
+          return false
+        }
         if(typeof element_filters.any == 'object'){
           // At least one of these is required to match
           var any = true
           for(var key in element_filters.any){
-            if(!recipient_filters.hasOwnProperty(key)){
+            if(!this.recipient_filters.hasOwnProperty(key)){
               any = false
               break
             }
-            var include_source = Set.from_iterable(recipient_filters[key])
+            var include_source = Set.from_iterable(this.recipient_filters[key])
             var include_test = Set.from_iterable(element_filters.any[key])
             if(include_source.intersection(include_test).size == 0){
               any = false
@@ -1559,11 +1565,11 @@ var initHooch = function(){
         // All of these are required to match
         var all = true
         for(var key in element_filters.all){
-          if(!recipient_filters.hasOwnProperty(key)){
+          if(!this.recipient_filters.hasOwnProperty(key)){
             all = false
             break
           }
-          var include_source = Set.from_iterable(recipient_filters[key])
+          var include_source = Set.from_iterable(this.recipient_filters[key])
           var include_test = Set.from_iterable(element_filters.all[key])
           if(!include_source.isSuperset(include_test)){
             all = false
@@ -1574,8 +1580,8 @@ var initHooch = function(){
         // None of these can be present to match
         var none = true
         for(var key in element_filters.none){
-          if(!recipient_filters.hasOwnProperty(key)){continue}
-          var exclude_source = Set.from_iterable(recipient_filters[key])
+          if(!this.recipient_filters.hasOwnProperty(key)){continue}
+          var exclude_source = Set.from_iterable(this.recipient_filters[key])
           var exclude_test = Set.from_iterable(element_filters.none[key])
           if(exclude_source.intersection(exclude_test).size != 0){
             none = false
@@ -1698,9 +1704,9 @@ var initHooch = function(){
       },
       onMousemove: function(e){
         if(this.disabled) return
-        hooch.pauseEvent(e)
         if(this.pressed){this.setDragging()}
         if(this.dragging){
+          hooch.pauseEvent(e)
           var target_sorter = this.targetSorter(e)
           if(target_sorter){
             this.attachToSorter(target_sorter,e)
@@ -1708,8 +1714,8 @@ var initHooch = function(){
             this.sorter.handleDrag()
           }
           this.setPosition(e)
+          return false
         }
-        return false
       },
       onMouseup: function(e){
         if(this.disabled) return
@@ -1725,8 +1731,9 @@ var initHooch = function(){
       },
       currentSorters: function(){
         var sort_element = this
-        return window.any_time_manager.recordedObjects['hooch.Sorter'].
+        var these_sorters = window.any_time_manager.recordedObjects['hooch.Sorter'].
           filter(function(sorter){return sorter != sort_element.sorter}) //Don't need the current parent
+        these_sorters.filter(function(sorter){return sorter.recipient_filters})
       },
       targetSorter: function(e){
         var current_sorters = this.currentSorters()

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.15.16"
+  VERSION = "0.15.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.15.16
+  version: 0.15.17
 platform: ruby
 authors:
 - Eric Draut