hooch 0.15.17 → 0.15.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9e1a2069e3af9fcaa50e8499403980a6bf6e6c
-  data.tar.gz: b002417fd825a53c126a23d91f15406fc0de9a57
+  metadata.gz: 8a889eef8d20772bb1c2e79e8950b171afed9e49
+  data.tar.gz: 99af2a2ef4c9569962745436fbddf2a8922d37da
 SHA512:
-  metadata.gz: 5cbf71d663e7a7e5f40fce2ec8bde9295088646dc361451558ab100d8eda2627e6b51b08851209cc28acd1ba4b65eeb5f41fcfc2873c390b0e48d6c18e12cbd8
-  data.tar.gz: 71239cfb4182e1fbcb67f6ec6fb623fea7137982ee806ddcc315faec4afb48140cfbe8c88ea20b8379b315318957c07937b1589026876b776f215bf3a81b2d46
+  metadata.gz: 2f42ee4fbf309d9c68ddfed75b97ce7f44af39f348c5036f6314b076b9e4438ed94e5a6012d40e4dd33860f0afb40b64910de050cd72226c94e220e38e215031
+  data.tar.gz: dc8cb30d4861bae12923e71689447be83182a23f133dffa9ac09dab5805b5b9576461f3e2e0eb17853825403b11eaa33b26d9b7f01725e0c870c12496715a924

data/app/assets/javascripts/hooch.js

@@ -45,6 +45,17 @@ Set.from_iterable = function(arr) {
   }
   return new_set
 }
+if(typeof UUID == 'undefined'){
+  var UUID = Class.extend({
+    init: function(){
+      this.value = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
+        return v.toString(16);
+      });
+    }
+  })
+
+}
 var initHooch = function(){
   hooch = {
     Emptier: Class.extend({
@@ -1173,12 +1184,8 @@ var initHooch = function(){
         var sorter = this;
         this.$sort_elements.each(function(){
           if($(this).data('hooch.SortElement')){
-            tmp_sort_element = $(this).data('hooch.SortElement')
-            // if(tmp_sort_element.is_placeholder){
-            //   var sort_element = tmp_sort_element.sort_element
-            // } else {
-              var sort_element = tmp_sort_element
-            // }
+            var sort_element = $(this).data('hooch.SortElement')
+            sort_element.refreshAfterPossibleMutation()
           } else {
             var sort_element = new hooch.SortElement($(this),sorter)
           }
@@ -1508,7 +1515,7 @@ var initHooch = function(){
         } else {
           var first_id = id_array[0]
           var last_underscore_location = first_id.lastIndexOf('_')
-          var array_name = first_id.slice(0,last_underscore_location)          
+          var array_name = first_id.slice(0,last_underscore_location)
           form_data[array_name] = id_array.map(function(id){
             return id.slice((last_underscore_location + 1))
           })
@@ -1580,7 +1587,7 @@ var initHooch = function(){
         // None of these can be present to match
         var none = true
         for(var key in element_filters.none){
-          if(!this.recipient_filters.hasOwnProperty(key)){continue}
+          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){
@@ -1629,10 +1636,7 @@ var initHooch = function(){
         var send_sort_now = this.$sorter.find('[data-send-sort-now]')
         var sorter = this
         if(send_sort_now.length > 0){
-          console.log('got send sort:')
-          console.log(this.$sorter.attr('id'))
           send_sort_now.on('click', function(){
-            console.log('sending sort...')
             sorter.sendSort()
           })
         }
@@ -1677,9 +1681,7 @@ var initHooch = function(){
         this.dragging = false
         this.getDragHandle()
         this.$sort_element.css({cursor: ''});
-        this.$drag_handle.css({cursor: 'move'});
         var sort_element = this
-        this.$drag_handle.on('mousedown touchstart', $.proxy(sort_element.onMousedown, sort_element))
         this.$sort_element.on('dragstart', function(e){hooch.pauseEvent(e); return false})
         this.element_filters = this.getElementFilters() || {}
         $(window).on('mousemove touchmove', function(e){
@@ -1707,13 +1709,13 @@ var initHooch = function(){
         if(this.pressed){this.setDragging()}
         if(this.dragging){
           hooch.pauseEvent(e)
+          this.setPosition(e)
           var target_sorter = this.targetSorter(e)
           if(target_sorter){
             this.attachToSorter(target_sorter,e)
           } else if(this.sorter){
             this.sorter.handleDrag()
           }
-          this.setPosition(e)
           return false
         }
       },
@@ -1729,11 +1731,14 @@ var initHooch = function(){
           this.drop()
         }
       },
+      refreshAfterPossibleMutation: function(){
+        this.getDragHandle()
+      },
       currentSorters: function(){
         var sort_element = this
         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})
+        return these_sorters.filter(function(sorter){return sorter.recipient_filters})
       },
       targetSorter: function(e){
         var current_sorters = this.currentSorters()
@@ -1786,6 +1791,15 @@ var initHooch = function(){
         if(this.$drag_handle.length < 1){
           this.$drag_handle = this.$sort_element
         }
+        this.initializeDragHandle()
+      },
+      initializeDragHandle: function(){ // Starting to look like this needs its own DragHandle class?
+        if(!this.$drag_handle.data('hooch.drag_handle_initialized')){
+          this.$drag_handle.css({cursor: 'move'});
+          var sort_element = this
+          this.$drag_handle.on('mousedown touchstart', $.proxy(sort_element.onMousedown, sort_element))
+          this.$drag_handle.data('hooch.drag_handle_initialized',true)
+        }
       },
       createPlaceHolder: function(){
         var $placeholder = this.$sort_element.
@@ -2018,9 +2032,9 @@ var initHooch = function(){
   };
   hooch.SortPlaceholder = hooch.SortElement.extend({
     init: function($sort_element,sort_element){
-      var new_uuid = new UUID
       //////////////////////////////////////////
       // Helpful for debugging in the browser
+      // var new_uuid = new UUID
       // this.uniq_id = new_uuid.value
       //////////////////////////////////////////
 

data/lib/hooch/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hooch
 version: !ruby/object:Gem::Version
-  version: 0.15.17
+  version: 0.15.18
 platform: ruby
 authors:
 - Eric Draut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails