active_scaffold_sortable 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0a5c9b42e05a1d29a5fa7dd07cd344b0284c1b4
-  data.tar.gz: 370270a2c3a0b1624a499ea6b0e370fe7bf859f7
+  metadata.gz: 12b3b4375b8bb35bcc851b5219b358178c9b4054
+  data.tar.gz: adae7a6bf7560acd094fe1338586fb7df28616ca
 SHA512:
-  metadata.gz: c9003cc73e265375204b884de5392abc795d4ffe4854974acab2db5c6860c82f77cb1685e643071ee403e8262f2b13ad4a230355c42fa7cd80398459a196a4fd
-  data.tar.gz: 5a23e8ead750614e248bb41e9739c5bb9c75907409efd728e91dd94676361c74df42379feb5251d213794049bf07a3dfd868dbf41679dc68c25c518d277f5f16
+  metadata.gz: 1bd583874658fea4563d85c82a5352cafa482543c081c75d8cb9448203b5bb253f5b864184279c508e952da840695f8a1793db7aaa9712718130b1cbc536aa31
+  data.tar.gz: df9a188389ee2ffb54fc270d750a0930eeea09eb59955147dd1c6bb5be51840222252fbd2d5e2cc93295455bf409d929bf42dc2eb43436976af1722fac830888

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

@@ -8,11 +8,18 @@ ActiveScaffold.update_positions = function(content) {
 ActiveScaffold.sortable = function(element) {
   var fixHelper = function(e, ui) {
     ui.find('*').each(function() {
-      jQuery(this).data('sortable-prev-style', jQuery(this).attr('style'));
-      jQuery(this).width(jQuery(this).width());
+      var $this = jQuery(this);
+      $this.data('sortable-prev-style', $this.attr('style'));
+      $this.width($this.width());
     });
     return ui;
   };
+  var copyHelperToPlaceholder = function(e, ui) {
+    var items = ui.placeholder.find('td');
+    ui.helper.find('td').each(function(i) {
+      jQuery(items[i]).width(jQuery(this).width());
+    });
+  };
   var restoreHelper = function(e, ui) {
     ui.helper.find('*').each(function() {
       var style = jQuery(this).data('sortable-prev-style');
@@ -21,7 +28,7 @@ ActiveScaffold.sortable = function(element) {
       jQuery(this).removeData('sortable-prev-style');
     });
   };
-  var form, content, sortable_options = {containment: 'parent', tolerance: 'pointer', forcePlaceholderSize: true, placeholder: 'sortable-highlight', helper: fixHelper, beforeStop: restoreHelper};
+  var form, content, sortable_options = {containment: 'parent', tolerance: 'pointer', forcePlaceholderSize: true, placeholder: 'sortable-highlight', helper: fixHelper, beforeStop: restoreHelper, start: copyHelperToPlaceholder};
   if (typeof(element) == 'string') {
     content = jQuery('#' + element);
     element = content.closest('.sortable-container');
@@ -50,7 +57,7 @@ ActiveScaffold.sortable = function(element) {
     }
   }
   sortable_options.handle = element.data('handle');
-  sortable_options.items = '> ' + element.data('tag');
+  sortable_options.items = element.data('tag');
   content.sortable(sortable_options);
 };
 

data/app/assets/stylesheets/active_scaffold_sortable.css.scss

@@ -1,6 +1,5 @@
 .sortable-handle { cursor: move; }
 .active-scaffold .sub-form table td.sortable-handle { display: table-cell; visibility: visible; }
-.active-scaffold .sub-form tbody.sortable-highlight { display: table-row; }
 td.sortable-handle, .active-scaffold .sub-form table td.sortable-handle {
   background: image-url('active_scaffold/sortable.png') no-repeat center center;
   width: 16px;

data/app/views/active_scaffold_overrides/_form_association.html.erb

@@ -1,6 +1,6 @@
 <% config = active_scaffold_config_for(column.association.klass) %>
 <% if config.actions.include? :sortable %>
-<%= content_tag :div, render(:super), :class => 'sortable-container', :data => sort_params(config).merge(:tag => '.sub-form-record') %>
+<%= content_tag :div, render(:super), :class => 'sortable-container', :data => sort_params(config).merge(:tag => "##{sub_form_list_id(:association => column.name, :id => parent_record.try(:id) || generated_id(parent_record) || 99999999999)} > .sub-form-record") %>
 <% else %>
 <%= render :super %>
 <% end %>

data/lib/active_scaffold_sortable/version.rb

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

data/lib/active_scaffold_sortable/view_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
   module ViewHelpers
     def sort_params(config = active_scaffold_config)
       options = {
-        :tag => 'tr', 
+        :tag => '> tr', 
         :format => '^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$',
         :column => config.sortable.column.name
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold