activeadmin_sortable_table 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff2920f60aff67fdac3ec70b48d4d5210a835da2
-  data.tar.gz: 262a555140d2385c54f1de47b6cdf841039dffcb
+  metadata.gz: 7eee1f5a8aea16d3c1e840ab58b4d5e357503ae0
+  data.tar.gz: 20b55c4342234b9afeb1e3808c93d3a96768bc76
 SHA512:
-  metadata.gz: 683dc3e1766264211cd93c433444adf5282effc9dede49e752d8a47baab9b6aa53d80a087775d2bfcea3b6545cda538cc5947901db109b6ef68a3d6be90059f9
-  data.tar.gz: d2c833437e3b94461d0843c453b67e61e0cdaa0d03510a4a93b2e04c90edd6f492cfb2511df9189f73ee9282f984ecb302bccbb011eb93672f9f87622c4bd7b2
+  metadata.gz: 861ada336d936e7d31d4733d9563cdf0954fd0cbb2ab31273f74aafb6579ecda25a13e780cef0a2311be0542d1e4a4a51499b7581aace52fd5587a0f6ab47369
+  data.tar.gz: 087823ddf085e64d6f1dc4fa35c21e2062ad9e59c369f9a2705454f8fe631c31e9564232735e505005525fbc25039ad064643176ad7660dc608a0b4742be8f38

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+1.1.2
+
+  * **Fix**. Reload page after drug-and-dropping rows, so it recalculates positions properly.

data/app/assets/javascripts/activeadmin_sortable_table.js

@@ -19,14 +19,11 @@
           url: url,
           type: 'post',
           data: $.extend(customParams, { position: ui.item.find('[data-position]').data('position') - 1 }),
-          error: function() { console.error('Saving sortable error'); },
-          success: function() {
-            if (actionOnSuccess === 'noting') { return; }
-
-            $("tr", $('.handle').closest('tbody')).removeClass('even odd');
-            $("tr", $('.handle').closest('tbody')).filter(":even").addClass('odd');
-            $("tr", $('.handle').closest('tbody')).filter(":odd").addClass('even');
-          }
+          error: function () { console.error('Saving sortable error'); },
+          success: function () {
+            location.href = location.href;
+          },
+          async: false
         });
       }
     });

data/lib/active_admin/sortable_table/version.rb

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

data/spec/dummy/app/admin/categories.rb

@@ -7,6 +7,7 @@ ActiveAdmin.register Category do
   index do
     handle_column
     id_column
+    column :position
     actions
   end
 end

data/spec/features/drag_and_drop_spec.rb

@@ -16,10 +16,12 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       visit admin_categories_path
 
       expect(visible_elements).to eq([1, 2, 3])
+      expect(visible_positions).to eq([1, 2, 3])
 
       move_higher(2, by_handle: true)
 
       expect(visible_elements).to eq([2, 1, 3])
+      expect(visible_positions).to eq([1, 2, 3])
       expect(ordered_elements).to eq([2, 1, 3])
     end
 
@@ -29,10 +31,12 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       visit admin_categories_path
 
       expect(visible_elements).to eq([1, 2, 3])
+      expect(visible_positions).to eq([1, 2, 3])
 
       move_higher(2, by_handle: false)
 
       expect(visible_elements).to eq([1, 2, 3])
+      expect(visible_positions).to eq([1, 2, 3])
       expect(ordered_elements).to eq([1, 2, 3])
     end
   end
@@ -50,10 +54,12 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       visit admin_categories_path(page: 2)
 
       expect(visible_elements).to eq([4, 5, 6])
+      expect(visible_positions).to eq([4, 5, 6])
 
       move_higher(5, by_handle: true)
 
       expect(visible_elements).to eq([5, 4, 6])
+      expect(visible_positions).to eq([4, 5, 6])
       expect(ordered_elements).to eq([1, 2, 3, 5, 4, 6])
     end
 
@@ -63,10 +69,12 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       visit admin_categories_path(page: 2)
 
       expect(visible_elements).to eq([4, 5, 6])
+      expect(visible_positions).to eq([4, 5, 6])
 
       move_higher(5, by_handle: false)
 
       expect(visible_elements).to eq([4, 5, 6])
+      expect(visible_positions).to eq([4, 5, 6])
       expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
     end
   end
@@ -77,18 +85,18 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
     all('.ui-sortable .col-id').map(&:text).map(&:to_i)
   end
 
+  def visible_positions
+    all('.ui-sortable .col-position').map(&:text).map(&:to_i)
+  end
+
   def move_higher(element_id, by_handle:)
     drag_element(element_id, by_handle, dy: -200)
   end
 
   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
+    selector = by_handle ? "#category_#{element_id} .handle" : "#category_#{element_id}"
+    page.execute_script(%($("#{selector}").simulate("drag", #{options.to_json})))
+    sleep 0.1
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_sortable_table
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -151,6 +151,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt