RubyGems - active_scaffold_sortable - Versions diffs - 3.1.2 → 3.2.0 - Mend

active_scaffold_sortable 3.1.2 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

data/LICENSE.txt CHANGED Viewed

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Richard White
+Copyright (c) 2011-2012 Sergio Cambra
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile CHANGED Viewed

@@ -1,6 +1,6 @@
 h1. Drag-Drop Sortable for ActiveScaffold
-Currently, this plugin is compatible with rails 3.x and master branches of vhochstein/ActiveScaffold.
+Currently, this plugin is compatible with rails 3.x and ActiveScaffold 3.x gems.
 h2. Overview
@@ -8,11 +8,11 @@ This plugin enables those slicker-than-snot ajax drag-drop sortable elements on
 h2. Installation
-You'll need at least vhochstein/ActiveScaffold to use this, and rails 3.x
+You'll need at least ActiveScaffold 3.x to use this, and rails 3.x
 <pre>
-script/plugin install clone git://github.com/vhochstein/active_scaffold_sortable.git
+gem install active_scaffold_sortable
 </pre>
 h2. Usage
@@ -28,14 +28,18 @@ Create a model with a column named 'position':
 # title        string(255)
 # birthday     date
 # position     integer
+</pre>
+h4. Step 2
+Add acts_as_list to the model.
+<pre>
 class Entry < ActiveRecord::Base
+  acts_as_list # this line
 end
 </pre>
-h4. Step 2
-Create your scaffold controller
+You can skip adding acts_as_list to the model, but you will have to enable sortable in the controller.
 <pre>
 # app/controllers/entries_controller.rb
@@ -48,38 +52,15 @@ class EntryController < ApplicationController
 end
 </pre>
-h4. Step 3
-Create your layout
-<pre>
-# app/views/layouts/application.rhtml
-<html>
-<head>
-  <title>active scaffold demo application</title>
-  <%= javascript_include_tag :defaults %>
-  <%= active_scaffold_includes %>
-</head>
-<body>
-  <%= yield %>
-</body>
-</html>
-</pre>
-h2. Notice:
-If you are using acts_as_list plugin you can skip the step 3
 h2. Support
-If you have issues installing the plugin, search / post to the "Active Scaffold":http://groups.google.com/group/activescaffold forum or "Create an issue":http://github.com/vhochstein/active_scaffold_sortable/issues
+If you have issues installing the plugin, search / post to the "Active Scaffold":http://groups.google.com/group/activescaffold forum or "Create an issue":http://github.com/activescaffold/active_scaffold_sortable/issues
 h2. Contributing
 Fork, hack, push, and request a pull:
-http://github.com/vhochstein/active_scaffold_sortable/
+http://github.com/activescaffold/active_scaffold_sortable/
 h2. License

data/app/assets/images/active_scaffold/sortable.png ADDED Viewed

Binary file

data/app/assets/javascripts/active_scaffold_sortable.js.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <% require_asset "#{ActiveScaffold.js_framework}/active_scaffold_sortable" %>

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

@@ -0,0 +1,46 @@
+ActiveScaffold.update_positions = function(content) {
+  if (typeof(content) == 'string') content = jQuery('#' + content);
+  var element = content.closest('.sortable-container');
+  jQuery.each(content.find('.sub-form-record input[name$="[' + element.data('column') + ']"]'), function(i, field) {
+    jQuery(field).val(i);
+  });
+}
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = jQuery('#' + element);
+    element = content.closest('.sortable-container');
+    form = element.closest('form.as_form').length > 0;
+  } else {
+    form = element.closest('form.as_form').length > 0;
+    if (form) content = element;
+    else content = element.find('.records:first');
+  }
+  if (form) {
+    sortable_options.update = function(event, ui) {
+      ActiveScaffold.update_positions(content);
+    };
+  } else {
+    var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
+    var url = element.data('reorder-url');
+    sortable_options.update = function(event, ui) {
+      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;
+      jQuery.post(url, body + '&' + csrf);
+    };
+  }
+  sortable_options.handle = element.data('handle');
+  sortable_options.items = element.data('tag');
+  content.sortable(sortable_options);
+};
+jQuery(document).ready(function($) {
+  $(document).on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $('.sortable-container', action_link.adapter);
+    if (sortable.length) $.each(sortable, function(i, s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable);
+});

data/app/assets/javascripts/jquery/active_scaffold_sortable.js~ ADDED Viewed

@@ -0,0 +1,45 @@
+ActiveScaffold.update_positions = function(content) {
+  if (typeof(content) == 'string') content = jQuery('#' + content);
+  var element = content.closest('.sortable-container');
+  jQuery.each(content.find('.sub-form-record input[name$="[' + element.data('column') + ']"]'), function(i, field) {
+    jQuery(field).val(i);
+  });
+}
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = jQuery('#' + element);
+    element = content.closest('.sortable-container');
+  } else {
+    var form = element.closest('form.as_form').length > 0;
+    if (form) content = element;
+    else content = element.find('.records:first');
+  }
+  if (form) {
+    sortable_options.update = function(event, ui) {
+      ActiveScaffold.update_positions(content);
+    };
+  } else {
+    var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
+    var url = element.data('reorder-url');
+    sortable_options.update = function(event, ui) {
+      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;
+      jQuery.post(url, body + '&' + csrf);
+    };
+  }
+  sortable_options.handle = element.data('handle');
+  sortable_options.items = element.data('tag');
+  content.sortable(sortable_options);
+};
+jQuery(document).ready(function($) {
+  $(document).on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $('.sortable-container', action_link.adapter);
+    if (sortable.length) $.each(sortable, function(i, s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable);
+});

data/app/assets/javascripts/prototype/active_scaffold_sortable.js ADDED Viewed

@@ -0,0 +1,34 @@
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = $(element);
+    element = content.up('.sortable-container');
+  } else {
+    var form = !!element.up('form.as_form');
+    if (form) content = element;
+    else content = element.down('.records');
+  }
+  if (!form) {
+    var csrf = $$('meta[name=csrf-param]')[0].readAttribute('content') + '=' + $$('meta[name=csrf-token]')[0].readAttribute('content');
+    var url = element.readAttribute('data-reorder-url').append_params(csrf);
+    sortable_options.onUpdate = function() {
+      var body = Sortable.serialize(content);
+      var params = element.readAttribute('data-with');
+      if (params) body += '&' + params;
+      new Ajax.Request(url, {method: 'post', parameters: body + '&' + csrf});
+    }
+  }
+  sortable_options.handle = element.readAttribute('data-handle');
+  sortable_options.items = element.readAttribute('data-tag');
+  Sortable.create(content, sortable_options);
+};
+document.observe('dom:loaded', function(){
+  document.on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $(action_link.adapter).find('.sortable-container');
+    if (sortable.length) sortable.invoke(function(s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $$('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable[0]);
+});

data/app/assets/javascripts/prototype/active_scaffold_sortable.js~ ADDED Viewed

@@ -0,0 +1,34 @@
+ActiveScaffold.sortable = function(element) {
+  var form, content, sortable_options = {};
+  if (typeof(element) == 'string') {
+    content = $(element);
+    element = content.up('.sortable-container');
+  } else {
+    var form = !!element.up('form.as_form');
+    if (form) content = element.down('.sub-form');
+    else content = element.down('.records');
+  }
+  if (!form) {
+    var csrf = $$('meta[name=csrf-param]')[0].readAttribute('content') + '=' + $$('meta[name=csrf-token]')[0].readAttribute('content');
+    var url = element.readAttribute('data-reorder-url').append_params(csrf);
+    sortable_options.onUpdate = function() {
+      var body = Sortable.serialize(content);
+      var params = element.readAttribute('data-with');
+      if (params) body += '&' + params;
+      new Ajax.Request(url, {method: 'post', parameters: body + '&' + csrf});
+    }
+  }
+  sortable_options.handle = element.readAttribute('data-handle');
+  sortable_options.items = element.readAttribute('data-tag');
+  Sortable.create(content, sortable_options);
+};
+document.observe('dom:loaded', function(){
+  document.on('as:action_success', 'a.as_action', function(e, action_link) {
+    var sortable = $(action_link.adapter).find('.sortable-container');
+    if (sortable.length) sortable.invoke(function(s) { ActiveScaffold.sortable(s); });
+  });
+  var sortable = $$('.sortable-container');
+  if (sortable.length) ActiveScaffold.sortable(sortable[0]);
+});

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

@@ -0,0 +1,7 @@
+.sortable-handle {
+  cursor: move;
+}
+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 ADDED Viewed

@@ -0,0 +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') %>
+<% else %>
+<%= render :super %>
+<% end %>

data/app/views/active_scaffold_overrides/_form_association.html.erb~ ADDED Viewed

@@ -0,0 +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 => 'tbody') %>
+<% else %>
+<%= render :super %>
+<% end %>

data/app/views/active_scaffold_overrides/edit_associated.js.erb ADDED Viewed

@@ -0,0 +1,6 @@
+<%= render :super %>
+<% config = active_scaffold_config_for(@column.association.klass) %>
+<% if config.actions.include? :sortable %>
+ActiveScaffold.update_positions('<%= sub_form_list_id(:association => @column.name) %>');
+ActiveScaffold.sortable('<%= sub_form_list_id(:association => @column.name) %>');
+<% end %>

data/app/views/active_scaffold_overrides/edit_associated.js.erb~ ADDED Viewed

@@ -0,0 +1,6 @@
+<%= render :super %>
+<% config = active_scaffold_config_for(@column.association.klass) %>
+<% if config.actions.include? :sortable %>
+ActiveScaffold.update_position('<%= sub_form_list_id(:association => @column.name) %>');
+ActiveScaffold.sortable('<%= sub_form_list_id(:association => @column.name) %>');
+<% end %>

data/frontends/default/active_scaffold_overrides/_list.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= content_tag :div, render(:super), :class => 'sortable-container', :data => sort_params %>

data/frontends/default/active_scaffold_overrides/on_create.js.erb ADDED Viewed

@@ -0,0 +1,4 @@
+<%= render(:super, :locals => {:insert_at => :bottom}) %>
+<% if controller.send(:successful?) && !nested_singular_association? %>
+  ActiveScaffold.sortable('<%= active_scaffold_tbody_id %>');
+<% end %>

data/frontends/default/active_scaffold_overrides/on_create.js.erb~ ADDED Viewed

@@ -0,0 +1,4 @@
+<%= render(:super, :locals => {:insert_at => :bottom}) %>
+<% if controller.send(:successful?) && !nested_singular_association? %>
+  ActiveScaffold.sortable('<%= active_scaffold_tbody_id %>'); %>
+<% end %>

data/frontends/default/active_scaffold_overrides/on_update.js.erb ADDED Viewed

@@ -0,0 +1,4 @@
+<%= render(:super) %>
+<% if controller.send(:successful?) && !nested_singular_association? %>
+  ActiveScaffold.sortable('<%= active_scaffold_tbody_id %>');
+<% end %>

data/frontends/default/{views/on_update.js.erb → active_scaffold_overrides/on_update.js.erb~} RENAMED Viewed

File without changes

data/frontends/default/active_scaffold_overrides/reorder.js.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<% if active_scaffold_config.sortable.refresh_list %>
+<%= render :partial => 'refresh_list' %>
+<% else %>
+ActiveScaffold.stripe('<%= active_scaffold_tbody_id %>');
+<% end %>

data/lib/active_scaffold/actions/sortable.rb CHANGED Viewed

@@ -12,13 +12,12 @@ module ActiveScaffold::Actions
         config.list.sorting = { sortable_column => "asc" }
         config.actions.each do |action_name|
+          next if action_name == :subform
           action = config.send(action_name)
           action.columns.exclude(sortable_column) if action.respond_to? :columns
         end
-        dir = File.join(ActiveScaffold::Config::Sortable.plugin_directory, 'frontends')
-        base.add_active_scaffold_path File.join(dir, frontend, 'views') if config.frontend.to_sym != :default
-        base.add_active_scaffold_path File.join(dir, 'default', 'views')
+        base.add_active_scaffold_path File.join(ActiveScaffold::Config::Sortable.plugin_directory, 'frontends', 'default')
       end
     end
@@ -34,6 +33,7 @@ module ActiveScaffold::Actions
           reorder_simple_list(model)
         end
       end
+      do_refresh_list if active_scaffold_config.sortable.refresh_list
     end
     protected

data/lib/active_scaffold/actions/sortable.rb~ ADDED Viewed

@@ -0,0 +1,81 @@
+module ActiveScaffold::Actions
+  module Sortable
+    def self.included(base)
+      base.helper ActiveScaffold::Helpers::SortableHelpers
+      base.before_filter :sortable_authorized?, :only => :reorder
+      base.active_scaffold_config.configure do |config|
+        config.list.pagination = false
+        # turn sorting off
+        sortable_column = config.sortable.column.name
+        config.columns.each {|c| c.sort = false unless c.name == sortable_column }
+        config.list.sorting = { sortable_column => "asc" }
+        config.actions.each do |action_name|
+          next if action_name == :subform
+          action = config.send(action_name)
+          action.columns.exclude(sortable_column) if action.respond_to? :columns
+        end
+        base.add_active_scaffold_path File.join(ActiveScaffold::Config::Sortable.plugin_directory, 'frontends', 'default')
+      end
+    end
+    def reorder
+      model = active_scaffold_config.model
+      unless (model.instance_methods & [:nested_set_scope, 'nested_set_scope']).empty?
+        reorder_children_in_tree(model)
+      else
+        if model.respond_to? :ancestry_column
+          reorder_ancestry_tree(model)
+        else
+          reorder_simple_list(model)
+        end
+      end
+      do_refresh_list if active_scaffold_config.sortable.refresh_list
+    end
+    protected
+    def sortable_authorized?
+      authorized_for?(:action => :update)
+    end
+    def reorder_ancestry_tree(model)
+      first_record = model.find(params[active_scaffold_tbody_id].first)
+      unless first_record.nil?
+        records = first_record.is_root? ? model.roots: first_record.parent.children
+        reorder_simple_list(model)
+      else
+        Rails.logger.info("Failed to find first record to reorder")
+      end
+    end
+    def reorder_simple_list(model)
+      column_name = active_scaffold_config.sortable.column.name
+      debugger
+      params[active_scaffold_tbody_id].each_with_index do |id, index|
+        model.update_all({column_name => index + 1}, {model.primary_key => id})
+      end
+    end
+    def reorder_children_in_tree(model)
+      current_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}
+      new_order.each_with_index do |record_id, new_position|
+        if record_id != current_order[new_position].id
+          current_order = move_child(current_order.find {|child| child.id == record_id}, new_position, current_order)
+        end
+      end if new_order.length == current_order.length
+    end
+    def move_child(child, new_position, children)
+      old_position = children.index(child)
+      (old_position - new_position).abs.times do |step|
+        child.send((old_position - new_position) > 0 ? :move_left : :move_right)
+      end
+      child.self_and_siblings
+    end
+  end
+end

data/lib/active_scaffold/config/sortable.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 module ActiveScaffold::Config
   class Sortable < Base
     def initialize(core_config)
-      @options = {}
       @core = core_config
+      @options = self.class.options.clone
       self.column = core_config.model.new.position_column unless (@core.model.instance_methods & [:acts_as_list_class, 'acts_as_list_class']).empty?
       self.column = core_config.model.new.left_column_name unless (@core.model.instance_methods & [:nested_set_scope, 'nested_set_scope']).empty?
@@ -10,21 +10,65 @@ module ActiveScaffold::Config
         raise "ActiveScaffoldSortable: Missing sortable attribute '#{core_config.model.new.position_column}' in model '#{core_config.model.to_s}'" if @core.model.instance_methods.include? 'acts_as_list_class'
         raise "ActiveScaffoldSortable: Missing sortable attribute '#{core_config.model.new.left_column_name}' in model '#{core_config.model.to_s}'" if @core.model.instance_methods.include? 'nested_set_scope'
       end
+      self.add_handle_column = self.class.add_handle_column
+      self.refresh_list = self.class.refresh_list
     end
     cattr_accessor :plugin_directory
     @@plugin_directory = File.expand_path(__FILE__).match(%{(^.*)/lib/active_scaffold/config/sortable.rb})[1]
+    cattr_accessor :add_handle_column
+    @@add_handle_column = false
+    cattr_accessor :options
+    @@options = {}
+    cattr_accessor :refresh_list
     self.crud_type = :update
     attr_reader :column
     def column=(column_name)
       @column = @core.columns[column_name]
-      Rails.logger.error("ActiveScaffold Sortable: postion column: #{column_name} not found in model") if @column.nil?
+      if @column.nil?
+        Rails.logger.error("ActiveScaffold Sortable: postion column: #{column_name} not found in model")
+      else
+        @column.form_ui = :hidden
+        @column.css_class = 'sortable-handle'
+        @column.label = ''
+        @column.weight = -2**(0.size * 8 -2)
+      end
       @column
     end
     attr_accessor :options
+    attr_accessor :refresh_list
+    attr_reader :add_handle_column
+    def add_handle_column=(where)
+      if where
+        raise(ArgumentError, "Unknown handle column position: #{where}") unless [:first, :last].include?(where)
+        @options[:handle] = 'td.sortable-handle'
+        define_handle_column
+        if where == :first
+          @core.list.columns = [:active_scaffold_sortable] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :active_scaffold_sortable
+        else
+          @column.weight = 2**(0.size * 8 -2) -1
+          @core.list.columns.add :active_scaffold_sortable
+        end
+      else
+        @options.delete(:handle)
+      end
+      @add_handle_column = where
+    end
+    protected
+    def define_handle_column
+      @core.columns.add :active_scaffold_sortable
+      @core.columns.exclude :active_scaffold_sortable
+      @core.columns[:active_scaffold_sortable].label = ''
+      @core.columns[:active_scaffold_sortable].sort = false
+    end
   end
 end

data/lib/active_scaffold/helpers/sortable_helpers.rb CHANGED Viewed

@@ -1,23 +1,15 @@
 module ActiveScaffold::Helpers
   module SortableHelpers
-    def sort_params
-      options = {
-        :tag => 'tr',
-        :url => {:action => :reorder, :controller => controller_name },
-        :format => '/^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$/',
-        :with => "Sortable.serialize(#{active_scaffold_tbody_id.to_json})"
-      }
-      additional_params = [:parent_controller, :eid, :controller].reject {|param| params[param].blank?}
-      options[:with] = additional_params.inject(options[:with]) do |string, param|
-        "#{string} + '&#{param}=' + encodeURIComponent('#{escape_javascript params[param]}')"
-      end
-      options.merge! active_scaffold_config.sortable.options
-      [active_scaffold_tbody_id, options]
+    def list_row_class(record)
+      "#{'sortable-handle' unless active_scaffold_config.sortable.add_handle_column} #{super}"
     end
-    def list_row_class(record)
-      'sortable'
+    def column_class(column, column_value, record)
+      if column == :active_scaffold_sortable
+        'sortable-handle'
+      else
+        super
+      end
     end
   end
 end

data/lib/active_scaffold_sortable.rb CHANGED Viewed

@@ -6,6 +6,7 @@ module ActiveScaffoldSortable
   def self.root
     File.dirname(__FILE__) + "/.."
   end
+  autoload 'ViewHelpers', 'active_scaffold_sortable/view_helpers.rb'
 end
 module ActiveScaffold
@@ -21,6 +22,7 @@ module ActiveScaffold
     ActiveScaffold.autoload_subdir('helpers', self, File.dirname(__FILE__))
   end
 end
+ActionView::Base.send :include, ActiveScaffoldSortable::ViewHelpers
 ActiveScaffold::Config::Core.send :include, ActiveScaffoldSortable::Core
 ActiveScaffold.stylesheets << 'active_scaffold_sortable'
+ActiveScaffold.javascripts << 'active_scaffold_sortable'

data/lib/active_scaffold_sortable/core.rb CHANGED Viewed

@@ -7,7 +7,10 @@ module ActiveScaffoldSortable
     def initialize_with_sortable(model_id)
       initialize_without_sortable(model_id)
       # seems some rubies are returning strings in instance_methods and other symbols...
-      self.actions << :sortable if !(model.instance_methods & ['acts_as_list_class', :acts_as_list_class, 'nested_set_scope', :nested_set_scope]).empty?
+      if !(model.instance_methods & ['acts_as_list_class', :acts_as_list_class, 'nested_set_scope', :nested_set_scope]).empty?
+        self.actions << :sortable
+        self.sortable # force to load
+      end
     end
   end
 end

data/lib/active_scaffold_sortable/version.rb CHANGED Viewed

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

data/lib/active_scaffold_sortable/view_helpers.rb ADDED Viewed

@@ -0,0 +1,17 @@
+module ActiveScaffoldSortable
+  module ViewHelpers
+    def sort_params(config = active_scaffold_config)
+      options = {
+        :tag => 'tr',
+        :reorder_url => url_for(params_for(:action => :reorder, :controller => controller_name)),
+        :format => '^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$',
+        :column => config.sortable.column.name
+      }
+      options.merge config.sortable.options
+    end
+    def active_scaffold_sortable_column(record, column)
+      ''
+    end
+  end
+end

data/lib/active_scaffold_sortable/view_helpers.rb~ ADDED Viewed

@@ -0,0 +1,16 @@
+module ActiveScaffoldSortable
+  module ViewHelpers
+    def sort_params(config = active_scaffold_config)
+      options = {
+        :tag => 'tr',
+        :reorder_url => url_for(params_for(:action => :reorder, :controller => controller_name)),
+        :format => '^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$'
+      }
+      options.merge config.sortable.options
+    end
+    def active_scaffold_sortable_column(record, column)
+      ''
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version
-  hash: 7
+  hash: 15
   prerelease:
   segments:
   - 3
-  - 1
   - 2
-  version: 3.1.2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors:
 - Sergio Cambra
@@ -16,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00 Z
+date: 2012-12-18 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: &id001 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -28,12 +29,12 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id001
+  version_requirements: *id001
   prerelease: false
-  type: :development
   name: shoulda
 - !ruby/object:Gem::Dependency
-  version_requirements: &id002 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,12 +45,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
+  version_requirements: *id002
   prerelease: false
-  type: :development
   name: bundler
 - !ruby/object:Gem::Dependency
-  version_requirements: &id003 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -58,24 +59,25 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id003
+  version_requirements: *id003
   prerelease: false
-  type: :development
   name: rcov
 - !ruby/object:Gem::Dependency
-  version_requirements: &id004 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        hash: 7
+        hash: -1842552253
         segments:
         - 3
+        - 3
         - 0
-        version: "3.0"
-  requirement: *id004
+        - rc
+        version: 3.3.0.rc
+  version_requirements: *id004
   prerelease: false
-  type: :runtime
   name: active_scaffold
 description: Sort Tree or List Structures by Drag n Drop
 email: activescaffold@googlegroups.com
@@ -87,12 +89,25 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.textile
 files:
-- app/assets/stylesheets/active_scaffold_sortable.css
-- frontends/default/views/on_create.js.erb
-- frontends/default/views/on_update.js.erb
-- frontends/default/views/reorder.js.erb
-- frontends/default/views/_list_with_header.html.erb
+- app/assets/stylesheets/active_scaffold_sortable.css.scss
+- app/assets/images/active_scaffold/sortable.png
+- app/assets/javascripts/active_scaffold_sortable.js.erb
+- app/assets/javascripts/jquery/active_scaffold_sortable.js
+- app/assets/javascripts/jquery/active_scaffold_sortable.js~
+- app/assets/javascripts/prototype/active_scaffold_sortable.js
+- app/assets/javascripts/prototype/active_scaffold_sortable.js~
+- app/views/active_scaffold_overrides/_form_association.html.erb
+- app/views/active_scaffold_overrides/edit_associated.js.erb
+- app/views/active_scaffold_overrides/_form_association.html.erb~
+- app/views/active_scaffold_overrides/edit_associated.js.erb~
+- frontends/default/active_scaffold_overrides/_list.html.erb
+- frontends/default/active_scaffold_overrides/on_create.js.erb
+- frontends/default/active_scaffold_overrides/on_update.js.erb
+- frontends/default/active_scaffold_overrides/reorder.js.erb
+- frontends/default/active_scaffold_overrides/on_create.js.erb~
+- frontends/default/active_scaffold_overrides/on_update.js.erb~
 - lib/active_scaffold/actions/sortable.rb
+- lib/active_scaffold/actions/sortable.rb~
 - lib/active_scaffold/config/sortable.rb
 - lib/active_scaffold/helpers/sortable_helpers.rb
 - lib/active_scaffold_sortable.rb
@@ -100,6 +115,8 @@ files:
 - lib/active_scaffold_sortable/core.rb
 - lib/active_scaffold_sortable/version.rb
 - lib/active_scaffold_sortable/engine.rb
+- lib/active_scaffold_sortable/view_helpers.rb
+- lib/active_scaffold_sortable/view_helpers.rb~
 - LICENSE.txt
 - README.textile
 - test/auto_models_controller_test.rb
@@ -141,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key:
 specification_version: 3
 summary: Drag n Drop Sorting for Activescaffold

data/app/assets/stylesheets/active_scaffold_sortable.css DELETED Viewed

@@ -1,6 +0,0 @@
-.sortable {
-  cursor: move;
-}
-.sortable .in_place_editor_field {
-  cursor: pointer;
-}

data/frontends/default/views/_list_with_header.html.erb DELETED Viewed

@@ -1,9 +0,0 @@
-<%= render :super %>
-<% if ActiveScaffold.js_framework == :prototype %>
-<%= sortable_element *sort_params %>
-<% elsif ActiveScaffold.js_framework == :jquery %>
-  <% reorder_params = {}
-     reorder_params[:eid] = params[:eid] unless params[:eid].blank?
-     options = {:update => true, :action => 'reorder'} %>
-     <%= javascript_tag "ActiveScaffold.sortable('#{sort_params[0]}', #{url_for(:controller => controller_name).to_json}, #{options.to_json}, #{reorder_params.to_json});" %>
-<% end %>

data/frontends/default/views/on_create.js.erb DELETED Viewed

@@ -1,16 +0,0 @@
-<%= render(:super, :locals => {:insert_at => :bottom}) %>
-<%
-unless nested_singular_association?
-  if ActiveScaffold.js_framework == :prototype
-%>
-    <%= sortable_element_js(*sort_params) %>
-<%
-  elsif ActiveScaffold.js_framework == :jquery
-    reorder_params = {}
-    reorder_params[:eid] = params[:eid] unless params[:eid].blank?
-%>
-    <%= "ActiveScaffold.sortable('#{sort_params[0]}', #{controller_name.to_json}, #{reorder_params.to_json});".html_safe %>
-<%
-  end if controller.send :successful?
-end
-%>

data/frontends/default/views/reorder.js.erb DELETED Viewed

	@@ -1 +0,0 @@
1	- ActiveScaffold.stripe('<%= active_scaffold_tbody_id %>');