active_scaffold_sortable 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71221bcdb5596ef2f904f7f596e893535fd524b3
-  data.tar.gz: a0b611c659f5ac4d9368b34cfdfa72eb5c678710
+  metadata.gz: 2c14dd5e8d58a0208aee3c71b855154a86fb2bba
+  data.tar.gz: 509b37f696c12f5f23a5061e93b26f0aa03c62ba
 SHA512:
-  metadata.gz: af81bd998a18795ad13c48173598aa09a1d228d935cbf13c7aa46a3f042255090867f5dbaabb8b3d8d498e37d6190df7a5a4b2be83e47265403bd614c4f9253a
-  data.tar.gz: a6c2a3b4c8bf67c1eb31afe18cd490b71b2c7312138d5025b5e86728e6d556a7df8818cde460a458eac5199db7498a9687d26946b169054911c84adcb6346a76
+  metadata.gz: f845984504b564a4a3219c6b4dc6d2e9e007106a349be3e827645a105eedd0374168838af8393590ca276433b5fb9c80bee5bf6c94c175da7af987d93cba150c
+  data.tar.gz: bad7987f3ab945c25861545aa1187ea9faff0593de93cb2c8c2a8b8352b897b3757a26efbd13d2d5b1b6ce9a1cebe99f77e68c576a0d0d63b1c6a365957ba2c6

data/app/assets/javascripts/jquery/active_scaffold_sortable.js

@@ -8,17 +8,17 @@ ActiveScaffold.update_positions = function(content) {
 ActiveScaffold.sortable = function(element) {
   var fixHelper = function(e, ui) {
     ui.find('*').each(function() {
-      $(this).data('sortable-prev-style', $(this).attr('style'));
-      $(this).width($(this).width());
+      jQuery(this).data('sortable-prev-style', jQuery(this).attr('style'));
+      jQuery(this).width(jQuery(this).width());
     });
     return ui;
   };
   var restoreHelper = function(e, ui) {
     ui.helper.find('*').each(function() {
-      var style = $(this).data('sortable-prev-style');
-      if (style) $(this).attr('style', style);
-      else $(this).removeAttr('style');
-      $(this).removeData('sortable-prev-style');
+      var style = jQuery(this).data('sortable-prev-style');
+      if (style) jQuery(this).attr('style', style);
+      else jQuery(this).removeAttr('style');
+      jQuery(this).removeData('sortable-prev-style');
     });
   };
   var form, content, sortable_options = {containment: 'parent', tolerance: 'pointer', forcePlaceholderSize: true, placeholder: 'sortable-highlight', helper: fixHelper, beforeStop: restoreHelper};

data/lib/active_scaffold/actions/sortable.rb

@@ -42,10 +42,10 @@ module ActiveScaffold::Actions
     end
     
     def reorder_ancestry_tree(model)
-      first_record = model.find(params[active_scaffold_tbody_id].first)
+      first_record = model.find(ordered_ids.first)
       unless first_record.nil?
         records = first_record.is_root? ? model.roots: first_record.parent.children
-        reorder_simple_list(model)
+        reorder_simple_list(records)
       else
         Rails.logger.info("Failed to find first record to reorder")
       end
@@ -53,14 +53,14 @@ module ActiveScaffold::Actions
     
     def reorder_simple_list(model)
       column_name = active_scaffold_config.sortable.column.name
-      params[active_scaffold_tbody_id].each_with_index do |id, index|
+      ordered_ids.each.with_index do |id, index|
         model.where(model.primary_key => id).update_all(column_name => index + 1)
       end
     end
     
     def reorder_children_in_tree(model)
-      full_order = model.find(params[active_scaffold_tbody_id].first).try(:self_and_siblings)
-      new_order = params[active_scaffold_tbody_id].collect {|item_id| item_id.to_i}
+      full_order = model.find(ordered_ids.first).try(:self_and_siblings)
+      new_order = ordered_ids.collect {|item_id| item_id.to_i}
       current_order = full_order.length == new_order.length ? full_order : full_order.select{ |r| new_order.include? r.id }
 
       new_order.each_with_index do |record_id, new_position|
@@ -78,5 +78,9 @@ module ActiveScaffold::Actions
       child.self_and_siblings
     end
 
+    def ordered_ids
+      @ordered_ids ||= params.delete active_scaffold_tbody_id
+    end
+
   end
 end

data/lib/active_scaffold_sortable/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold