activeadmin_sortable_table 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2780b4ee0dd39671939f4ded13128f47c2fc89d
-  data.tar.gz: a54c714008eda20f4b25324df87745e2404ebef0
+  metadata.gz: ff2920f60aff67fdac3ec70b48d4d5210a835da2
+  data.tar.gz: 262a555140d2385c54f1de47b6cdf841039dffcb
 SHA512:
-  metadata.gz: d2162c02c4475bee3b894620f56bfabb7ba0bafeccfb255abeb65d85ed148990194e825d0199933ac73349cfd36d3a8cc286d68a014afa702311106a733a77aa
-  data.tar.gz: 8d7f5ca1742a2438e1dd5b14a15c56334885a856321c50f659f1cc767591d361a8b74315d69569d97e3dfae588f2cae78ec70f4414f91d81f1a8de728c22a81c
+  metadata.gz: 683dc3e1766264211cd93c433444adf5282effc9dede49e752d8a47baab9b6aa53d80a087775d2bfcea3b6545cda538cc5947901db109b6ef68a3d6be90059f9
+  data.tar.gz: d2c833437e3b94461d0843c453b67e61e0cdaa0d03510a4a93b2e04c90edd6f492cfb2511df9189f73ee9282f984ecb302bccbb011eb93672f9f87622c4bd7b2

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    activeadmin_sortable_table (1.1.0)
+    activeadmin_sortable_table (1.1.1)
       activeadmin (>= 1.0.0.pre1)
       uber (= 0.0.15)
 

data/app/assets/javascripts/activeadmin_sortable_table.js

@@ -5,6 +5,7 @@
 
   $.fn.activeAdminSortableTable = function() {
     this.sortable({
+      handle: ".handle",
       update: function(event, ui) {
         var item = ui.item.find('[data-sort-url]');
         var url = item.data('sort-url');

data/lib/active_admin/sortable_table/version.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   #
   module SortableTable
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/spec/features/drag_and_drop_spec.rb

@@ -10,18 +10,31 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
   end
 
   context 'first page' do
-    it 'reorder elements by dragging vertically', js: true do
+    it 'reorders elements by dragging vertically by handle', js: true do
       expect(ordered_elements).to eq([1, 2, 3])
 
       visit admin_categories_path
 
       expect(visible_elements).to eq([1, 2, 3])
 
-      move_higher(2)
+      move_higher(2, by_handle: true)
 
       expect(visible_elements).to eq([2, 1, 3])
       expect(ordered_elements).to eq([2, 1, 3])
     end
+
+    it 'does not reorder elements by dragging vertically by row', js: true do
+      expect(ordered_elements).to eq([1, 2, 3])
+
+      visit admin_categories_path
+
+      expect(visible_elements).to eq([1, 2, 3])
+
+      move_higher(2, by_handle: false)
+
+      expect(visible_elements).to eq([1, 2, 3])
+      expect(ordered_elements).to eq([1, 2, 3])
+    end
   end
 
   context 'second page' do
@@ -31,34 +44,51 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       Category.create!
     end
 
-    it 'reorder elements by dragging vertically', js: true do
+    it 'reorders elements by dragging vertically by handle', js: true do
       expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
 
       visit admin_categories_path(page: 2)
 
       expect(visible_elements).to eq([4, 5, 6])
 
-      move_higher(5)
+      move_higher(5, by_handle: true)
 
       expect(visible_elements).to eq([5, 4, 6])
       expect(ordered_elements).to eq([1, 2, 3, 5, 4, 6])
     end
+
+    it 'does not reorder elements by dragging vertically by row', js: true do
+      expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
+
+      visit admin_categories_path(page: 2)
+
+      expect(visible_elements).to eq([4, 5, 6])
+
+      move_higher(5, by_handle: false)
+
+      expect(visible_elements).to eq([4, 5, 6])
+      expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
+    end
   end
 
   private
 
   def visible_elements
-    all('.ui-sortable-handle .col-id').map(&:text).map(&:to_i)
+    all('.ui-sortable .col-id').map(&:text).map(&:to_i)
   end
 
-  def move_higher(element_id)
-    drag_element(element_id, dy: -200)
+  def move_higher(element_id, by_handle:)
+    drag_element(element_id, by_handle, dy: -200)
   end
 
-  def drag_element(element_id, options)
-    wait_for_ajax do
-      options.reverse_merge! moves: 20
-      page.execute_script(%($("#category_#{element_id} .handle").simulate("drag", #{options.to_json} )))
+  def drag_element(element_id, by_handle, options)
+    options.reverse_merge! moves: 20
+    if by_handle
+      wait_for_ajax do
+        page.execute_script(%($("#category_#{element_id} .handle").simulate("drag", #{options.to_json})))
+      end
+    else
+      page.execute_script(%($("#category_#{element_id}").simulate("drag", #{options.to_json})))
     end
   end
 end

data/spec/features/move_to_top_spec.rb

@@ -36,7 +36,7 @@ RSpec.describe ActiveAdmin::SortableTable, 'Move to top', type: :feature do
   private
 
   def visible_elements
-    all('.ui-sortable-handle .col-id').map(&:text).map(&:to_i)
+    all('.ui-sortable .col-id').map(&:text).map(&:to_i)
   end
 
   def move_to_top(element_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_sortable_table
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin