hooch 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50e01c687750265f50a10a17bd2ba2e6161b92cb
-  data.tar.gz: 49d02d95c90c7b1de4d8e23805baa07322f5a39e
+  metadata.gz: 4d67b1b958e3b12561ada28c23195172d87206bc
+  data.tar.gz: 5ff5259338df3bde4f96b7a4885c4cf0eef681cf
 SHA512:
-  metadata.gz: 105fbf16ca53a603d5f22f8f0718bd8172623737a47b6c7c5c8efea1b65aac3d00ee170ce479b9c0f04f6e996a037867722c25fcd60058758f8ec370ac8a2857
-  data.tar.gz: 4ee8021ad19eb852f6fca4be879a9144cec5c11ab1fb39543b60c473a67be3cfbbb5c119276c2e2cf174b82d74e94c3e10064605ba6726679695a1c2105fb13b
+  metadata.gz: 7c869362a248c2f485342e1c74ea027299a6baadd8b4078610bb35744d582175e126af33ef0b9984bfd22c048db269e5d1c95fb29806a3ebc78149515c7484b5
+  data.tar.gz: d4322ea13fd7dac82374153df36799b3d649959967a7c0de09e9920340d258685eeeea515ba434b700a30ea8875d711d1dd1fde4f6e6b282514b6e6acd129c36

data/app/assets/javascripts/hooch.js

@@ -604,11 +604,43 @@ var initHooch = function(){
       },
       onMousemove: function(e){
         if(this.dragging_element){
-          hooch.pauseEvent(e)
-          this.redrawDraggingElement(e);
-          this.refreshSequence(e)
-          return false
+          this.handleMouseMove(e)
+        } else {
+          var pressed_element = this.getPressedElement()
+          if(pressed_element){
+            pressed_element.setDragging()
+            this.handleMouseMove(e)
+          }
+        }
+        return true
+      },
+      handleMouseMove: function(e){
+        hooch.pauseEvent(e)
+        this.dragging_element.dragging = true
+        this.redrawDraggingElement(e);
+        this.refreshSequence(e)
+        return false
+      },
+      onMouseup: function(){
+        if(this.dragging_element){
+          var tmp_dragging_element = this.dragging_element
+          this.removeDraggingElement()
+          if(tmp_dragging_element.dragging){
+            this.sendSort()
+          }
+          tmp_dragging_element.dragging = false
+        }
+        var pressed_element = this.getPressedElement()
+        if(pressed_element){
+          pressed_element.unSetPressed()
+        }
+      },
+      getPressedElement: function(){
+        var possible_pressed_element = $.grep(this.sort_elements, function(sort_element,i){return sort_element.pressed})
+        if(possible_pressed_element.length > 0){
+          return possible_pressed_element[0]
         }
+        return false
       },
       getSortElements: function(){
         this.$sort_elements = this.$sorter.children()
@@ -848,10 +880,6 @@ var initHooch = function(){
           this.removeDraggingElement()
         }
       },
-      onMouseup: function(){
-        this.removeDraggingElement()
-        this.sendSort()
-      },
       removeDraggingElement: function(){
         if(this.dragging_element){
           var placeholder_row = this.removePlaceholder()
@@ -901,6 +929,7 @@ var initHooch = function(){
         this.old_position = $sort_element.css('position')
         this.width = this.$sort_element.width()
         this.height = this.$sort_element.height()
+        this.dragging = false
         var sort_element = this
         this.$sort_element.on('dragstart', function(e){
           hooch.pauseEvent(e)
@@ -911,22 +940,28 @@ var initHooch = function(){
       onMousedown: function(e){
         if(1 == e.which){
           this.sorter.clearDraggingElement();
-          hooch.pauseEvent(e)
+          this.pressed = true
           this.starting_offset = this.getOffset();
           this.mouse_start = {top: e.originalEvent.pageY, left: e.originalEvent.pageX}
-          this.placeholder = new hooch.SortPlaceholder(this.$sort_element.clone().removeAttr('id').css({width: this.width, height: this.height}),this.sorter)
-          this.placeholder.css({'visibility': 'hidden'});
-          this.placeholder.css({background: 'none', 'background-color': 'pink'});
-          $tmp = $('<div style="display: none;"></div>')
-          this.$sort_element.before($tmp)
-          this.$sort_element
-            .css({position: 'absolute', top: this.starting_offset.top, left: this.starting_offset.left})
-            .appendTo('body')
-          $tmp.replaceWith(this.placeholder.$sort_element)
-          this.sorter.setDraggingElement(this,e);
-          return false;
         }
       },
+      unSetPressed: function(){
+        this.pressed = false
+      },
+      setDragging: function(){
+        this.sorter.clearDraggingElement();
+        this.unSetPressed()
+        this.placeholder = new hooch.SortPlaceholder(this.$sort_element.clone().removeAttr('id').css({width: this.width, height: this.height}),this.sorter)
+        this.placeholder.css({'visibility': 'hidden'});
+        this.placeholder.css({background: 'none', 'background-color': 'pink'});
+        $tmp = $('<div style="display: none;"></div>')
+        this.$sort_element.before($tmp)
+        this.$sort_element
+          .css({position: 'absolute', top: this.starting_offset.top, left: this.starting_offset.left})
+          .appendTo('body')
+        $tmp.replaceWith(this.placeholder.$sort_element)
+        this.sorter.setDraggingElement(this);
+      },
       drop: function(){
         this.css({position: this.old_position, top: '', left: ''})
         this.placeholder.replaceWith(this.$sort_element);

data/jasmine/spec/hoochSpec.js

@@ -134,10 +134,25 @@ describe("hooch", function() {
     })
     it('Handles mousedown on a sort element', function(){
       sort_elem_a.onMousedown({which: 1, originalEvent: {pageY: 10, pageX: 10}})
+      //Pressing the left mouse button on a sort element sets the mousestart position
+      expect(sort_elem_a.mouse_start.top).toEqual(10)
+      expect(sort_elem_a.mouse_start.left).toEqual(10)
+      //That initial press should also set the 'pressed' attribute
+      expect(sort_elem_a.pressed).toBe(true)
+      //There should be no dragging element for the sorter yet
+      expect(sorter.dragging_element).toBeUndefined()
+
+    })
+    it('Handles the initial mousemove when dragging an element', function(){
+      sort_elem_a.onMousedown({which: 1, originalEvent: {pageY: 10, pageX: 10}})
+      sorter.onMousemove({originalEvent: {pageY: 10, pageX: 11}})
+      //Starting to move the mouse will unset the pressed flag so we don't try to initialize the movement again.
+      expect(sort_elem_a.pressed).toBe(false)
       //We set the dragging element for the sorter to be element 'a'
       expect(sorter.dragging_element.$sort_element.attr('id')).toEqual('a')
       //We created a placeholder for element a
       expect(sort_elem_a.placeholder.is_placeholder).toBe(true)
+
       var elem_before_b = sort_elem_b.$sort_element.prev()
       //The dom element for the placeholder had it's id removed to avoid duplication
       expect(elem_before_b.attr('id')).toBeUndefined()
@@ -145,6 +160,7 @@ describe("hooch", function() {
       expect(elem_before_b.is(sort_elem_a.placeholder.$sort_element)).toBe(true)
       //The real element 'a' is now attached directly to the body
       expect(sort_elem_a.$sort_element.parent()[0].nodeName).toEqual('BODY')
+
     })
     it('Handles mousemove when dragging an element', function(){
       sort_elem_a.onMousedown({which: 1, originalEvent: {pageY: 10, pageX: 10}})
@@ -165,11 +181,18 @@ describe("hooch", function() {
     it('Handles dropping an element', function(){
       sort_elem_a.onMousedown({which: 1, originalEvent: {pageY: 10, pageX: 10}})
       sorter.onMousemove({originalEvent: {pageY: 210, pageX: 10}})
-      sorter.removeDraggingElement()
+      sorter.onMouseup()
       last_elem = sorter.$sorter.children(':last')
       //Now the real element 'a' is in last place after being dragged below the sorter
       expect(sort_elem_a.$sort_element.is(last_elem)).toBe(true)
     })
+    it('Handles a click without a drag', function(){
+      sort_elem_a.onMousedown({which: 1, originalEvent: {pageY: 10, pageX: 10}})
+      sorter.onMouseup()
+      expect(sorter.dragging_element).toBeUndefined()
+      var pressed_element = sorter.getPressedElement()
+      expect(pressed_element).toBe(false)
+    })
     it('Builds form data', function(){
       sorter.$sorter.attr('data-sort-field','my_sort')
       form_data = sorter.getFormData()

data/lib/hooch/version.rb

@@ -1,3 +1,3 @@
 module Hooch
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

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