active_scaffold_sortable 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cd0c44502cbcc7967b70dad031314557ade83db
-  data.tar.gz: f392e547939379fc6f1c8452d9d52fbad41889ad
+  metadata.gz: 1492534bbf5bf0ae3b14f8083cb416449e963d56
+  data.tar.gz: 240734c1c652fe8410ed54a51cdfb8087eb8dbb3
 SHA512:
-  metadata.gz: 5b45dafbac1c12df2690fd2e1987b8cd94e7d2c5c918cf3dbf2a3ed40de561d3d6befa3f184fcac58a0c99a911f4477c9c273856ad2f7447a1ba1e3f258cab6d
-  data.tar.gz: b45b7308b54d5ee979160d7c23b8b44ec10c6f82c006113ca5aa82a065d958f113d08cf808c2232cd7e6d62c15551e886e6aaf9f4bdeee94111e175774c9ce7d
+  metadata.gz: 7009981cb6e297c4794fc29c9e32399f132f2d560eb092f01d9ab177fee1ef9202892ddf224d8de04b4618d55d36f62a8f73b6ef9e01f941b31e6d7bae6008cd
+  data.tar.gz: a806fccf5949785ccef9cd6878316f68b777bef939cda32a3923668a4af7393e19d1c8e5c19dbc8c1e0cd963b4a460f00cb34da563008ebcadd7e80f76b03c78

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

@@ -8,10 +8,19 @@ 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());
     });
     return ui;
   };
+  var restoreHelper = function(ui) {
+    ui.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 form, content, sortable_options = {containment: 'parent', tolerance: 'pointer', forcePlaceholderSize: true, placeholder: 'sortable-highlight', helper: fixHelper};
   if (typeof(element) == 'string') {
     content = jQuery('#' + element);
@@ -26,6 +35,7 @@ ActiveScaffold.sortable = function(element) {
   
   if (form) {
     sortable_options.update = function(event, ui) {
+      restoreHelper(content);
       ActiveScaffold.update_positions(content);
     };
   } else {
@@ -33,6 +43,7 @@ ActiveScaffold.sortable = function(element) {
     if (url) {
       var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
       sortable_options.update = function(event, ui) {
+        restoreHelper(content);
         var body = jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression: new RegExp(element.data('format'))});
         var params = element.data('with');
         if (params) body += '&' + params;

data/lib/active_scaffold_sortable.rb

@@ -24,7 +24,7 @@ module ActiveScaffold
   end
 end
 ActionView::Base.send :include, ActiveScaffoldSortable::ViewHelpers
-ActiveScaffold::Config::Core.send :include, ActiveScaffoldSortable::Core
-ActiveScaffold::AttributeParams.send :include, ActiveScaffoldSortable::AttributeParams
+ActiveScaffold::Config::Core.send :prepend, ActiveScaffoldSortable::Core
+ActiveScaffold::AttributeParams.send :prepend, ActiveScaffoldSortable::AttributeParams
 ActiveScaffold.stylesheets << 'active_scaffold_sortable'
 ActiveScaffold.javascripts << 'active_scaffold_sortable'

data/lib/active_scaffold_sortable/attribute_params.rb

@@ -1,11 +1,7 @@
 module ActiveScaffoldSortable
   module AttributeParams
-    def self.included(base)
-      base.alias_method_chain :update_column_from_params, :sortable
-    end
-
-    def update_column_from_params_with_sortable(parent_record, column, attribute, avoid_changes = false)
-      update_column_from_params_without_sortable(parent_record, column, attribute, avoid_changes).tap do |value|
+    def update_column_from_params(parent_record, column, attribute, avoid_changes = false)
+      super.tap do |value|
         if column.association.try(:collection?)
           config = active_scaffold_config_for(column.association.klass)
           if config.actions.include?(:sortable)

data/lib/active_scaffold_sortable/core.rb

@@ -1,11 +1,7 @@
 module ActiveScaffoldSortable
   module Core
-    def self.included(base)
-      base.alias_method_chain :initialize, :sortable
-    end
-
-    def initialize_with_sortable(model_id)
-      initialize_without_sortable(model_id)
+    def initialize(model_id)
+      super
       # seems some rubies are returning strings in instance_methods and other symbols...
       if !(model.instance_methods & ['acts_as_list_class', :acts_as_list_class, 'nested_set_scope', :nested_set_scope]).empty?
         self.actions << :sortable

data/lib/active_scaffold_sortable/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
 
     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.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="