activeadmin_sortable_table 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eee1f5a8aea16d3c1e840ab58b4d5e357503ae0
-  data.tar.gz: 20b55c4342234b9afeb1e3808c93d3a96768bc76
+  metadata.gz: 66207fb91f6c2abf4f7a29107fabb9ace050c52f
+  data.tar.gz: 679a10bc3b27667d32fe43a9a86dd14855bed9d7
 SHA512:
-  metadata.gz: 861ada336d936e7d31d4733d9563cdf0954fd0cbb2ab31273f74aafb6579ecda25a13e780cef0a2311be0542d1e4a4a51499b7581aace52fd5587a0f6ab47369
-  data.tar.gz: 087823ddf085e64d6f1dc4fa35c21e2062ad9e59c369f9a2705454f8fe631c31e9564232735e505005525fbc25039ad064643176ad7660dc608a0b4742be8f38
+  metadata.gz: f5ce91b8a8994c8322f90e941a4c5ba01cf7bcd0de42e5080eac43f8067969f0ab18871f945311f5b3a87ed276dd07e73b8045ec0f0a5c9e08754ef08ba86f48
+  data.tar.gz: 3686d18158dc53c1adaf5a581e72cced145057f33a8239e22448ed092b020e045b4302b3106eddecfbf9675eb78785b7bfd3324e3ddf91d5f333b3c24479193d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.1.3
+
+  * **Fix**. Reordering was broken.
+
 1.1.2
 
   * **Fix**. Reload page after drug-and-dropping rows, so it recalculates positions properly.

data/Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: .
   specs:
-    activeadmin_sortable_table (1.1.1)
+    activeadmin_sortable_table (1.1.3)
       activeadmin (>= 1.0.0.pre1)
       uber (= 0.0.15)
 

data/app/assets/javascripts/activeadmin_sortable_table.js

@@ -9,16 +9,30 @@
       update: function(event, ui) {
         var item = ui.item.find('[data-sort-url]');
         var url = item.data('sort-url');
-        var actionOnSuccess = item.data('sort-success-action');
         var customParams = {};
         if (typeof item.data('sort-custom-params') === 'object') {
           customParams = item.data('sort-custom-params');
         }
 
+        var nextElement = ui.item[0].nextElementSibling;
+
+        var nextPosition = $(nextElement).find('[data-position]').data('position');
+        var currentPosition = ui.item.find('[data-position]').data('position');
+
+        if(nextPosition === undefined || nextPosition > currentPosition) {
+          // moved down
+          var previousElement = ui.item[0].previousElementSibling;
+          var previousPosition = $(previousElement).find('[data-position]').data('position');
+          var newPosition = previousPosition;
+        } else {
+          // moved up
+          var newPosition = nextPosition;
+        }
+
         $.ajax({
           url: url,
           type: 'post',
-          data: $.extend(customParams, { position: ui.item.find('[data-position]').data('position') - 1 }),
+          data: $.extend(customParams, { position: newPosition }),
           error: function () { console.error('Saving sortable error'); },
           success: function () {
             location.href = location.href;

data/lib/active_admin/sortable_table/version.rb

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

data/spec/dummy/app/assets/javascripts/active_admin.js.coffee

@@ -1,3 +1,3 @@
 #= require active_admin/base
-#= require jquery.simulate
+#= require jquery.simulate.drag-sortable
 #= require activeadmin_sortable_table

data/spec/dummy/app/assets/javascripts/jquery.simulate.drag-sortable.js

@@ -0,0 +1,235 @@
+(function($) {
+    /*
+     * Simulate drag of a JQuery UI sortable list
+     * Repository: https://github.com/mattheworiordan/jquery.simulate.drag-sortable.js
+     * Author: http://mattheworiordan.com
+     *
+     * options are:
+     * - move: move item up (positive) or down (negative) by Integer amount
+     * - dropOn: move item to a new linked list, move option now represents position in the new list (zero indexed)
+     * - handle: selector for the draggable handle element (optional)
+     * - listItem: selector to limit which sibling items can be used for reordering
+     * - placeHolder: if a placeholder is used during dragging, we need to consider it's height
+     * - tolerance: (optional) number of pixels to overlap by instead of the default 50% of the element height
+     *
+     */
+    $.fn.simulateDragSortable = function(options) {
+        // build main options before element iteration
+        var opts = $.extend({}, $.fn.simulateDragSortable.defaults, options);
+
+        applyDrag = function(options) {
+            // allow for a drag handle if item is not draggable
+            var that = this,
+                options = options || opts, // default to plugin opts unless options explicitly provided
+                handle = options.handle ? $(this).find(options.handle)[0] : $(this)[0],
+                listItem = options.listItem,
+                placeHolder = options.placeHolder,
+                sibling = $(this),
+                moveCounter = Math.floor(options.move),
+                direction = moveCounter > 0 ? 'down' : 'up',
+                moveVerticalAmount = 0,
+                initialVerticalPosition = 0,
+                extraDrag = !isNaN(parseInt(options.tolerance, 10)) ? function() { return Number(options.tolerance); } : function(obj) { return ($(obj).outerHeight() / 2) + 5; },
+                dragPastBy = 0, // represents the additional amount one drags past an element and bounce back
+                dropOn = options.dropOn ? $(options.dropOn) : false,
+                center = findCenter(handle),
+                x = Math.floor(center.x),
+                y = Math.floor(center.y),
+                mouseUpAfter = (opts.debug ? 2500 : 10);
+
+            if (dropOn) {
+                if (dropOn.length === 0) {
+                    if (console && console.log) { console.log('simulate.drag-sortable.js ERROR: Drop on target could not be found'); console.log(options.dropOn); }
+                    return;
+                }
+                sibling = dropOn.find('>*:last');
+                moveCounter = -(dropOn.find('>*').length + 1) + (moveCounter + 1); // calculate length of list after this move, use moveCounter as a positive index position in list to reverse back up
+                if (dropOn.offset().top - $(this).offset().top < 0) {
+                    // moving to a list above this list, so move to just above top of last item (tried moving to top but JQuery UI wouldn't bite)
+                    initialVerticalPosition = sibling.offset().top - $(this).offset().top - extraDrag(this);
+                } else {
+                    // moving to a list below this list, so move to bottom and work up (JQuery UI does not trigger new list below unless you move past top item first)
+                    initialVerticalPosition = sibling.offset().top - $(this).offset().top - $(this).height();
+                }
+            } else if (moveCounter === 0) {
+                if (console && console.log) { console.log('simulate.drag-sortable.js WARNING: Drag with move set to zero has no effect'); }
+                return;
+            } else {
+                while (moveCounter !== 0) {
+                    if (direction === 'down') {
+                        if (sibling.next(listItem).length) {
+                            sibling = sibling.next(listItem);
+                            moveVerticalAmount += sibling.outerHeight();
+                        }
+                        moveCounter -= 1;
+                    } else {
+                        if (sibling.prev(listItem).length) {
+                            sibling = sibling.prev(listItem);
+                            moveVerticalAmount -= sibling.outerHeight();
+                        }
+                        moveCounter += 1;
+                    }
+                }
+            }
+
+            dispatchEvent(handle, 'mousedown', createEvent('mousedown', handle, { clientX: x, clientY: y }));
+            // simulate drag start
+            dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x+1, clientY: y+1 }));
+
+            if (dropOn) {
+                // jump to top or bottom of new list but do it in increments so that JQuery UI registers the drag events
+                slideUpTo(x, y, initialVerticalPosition);
+
+                // reset y position to top or bottom of list and move from there
+                y += initialVerticalPosition;
+
+                // now call regular shift/down in a list
+                options = jQuery.extend(options, { move: moveCounter });
+                delete options.dropOn;
+
+                // add some delays to allow JQuery UI to catch up
+                setTimeout(function() {
+                    dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y }));
+                }, 5);
+                setTimeout(function() {
+                    dispatchEvent(handle, 'mouseup', createEvent('mouseup', handle, { clientX: x, clientY: y }));
+                    setTimeout(function() {
+                        if (options.move) {
+                            applyDrag.call(that, options);
+                        }
+                    }, 5);
+                }, mouseUpAfter);
+
+                // stop execution as applyDrag has been called again
+                return;
+            }
+
+            // Sortable is using a fixed height placeholder meaning items jump up and down as you drag variable height items into fixed height placeholder
+            placeHolder = placeHolder && $(this).parent().find(placeHolder);
+
+            if (!placeHolder && (direction === 'down')) {
+                // need to move at least as far as this item and or the last sibling
+                if ($(this).outerHeight() > $(sibling).outerHeight()) {
+                    moveVerticalAmount += $(this).outerHeight() - $(sibling).outerHeight();
+                }
+                moveVerticalAmount += extraDrag(sibling);
+                dragPastBy += extraDrag(sibling);
+            } else if (direction === 'up') {
+                // move a little extra to ensure item clips into next position
+                moveVerticalAmount -= Math.max(extraDrag(this), 5);
+            } else if (direction === 'down') {
+                // moving down with a place holder
+                if (placeHolder.height() < $(this).height()) {
+                    moveVerticalAmount += Math.max(placeHolder.height(), 5);
+                } else {
+                    moveVerticalAmount += extraDrag(sibling);
+                }
+            }
+
+            if (sibling[0] !== $(this)[0]) {
+                // step through so that the UI controller can determine when to show the placeHolder
+                slideUpTo(x, y, moveVerticalAmount, dragPastBy);
+            } else {
+                if (window.console) {
+                    console.log('simulate.drag-sortable.js WARNING: Could not move as at top or bottom already');
+                }
+            }
+
+            setTimeout(function() {
+                dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y + moveVerticalAmount }));
+            }, 5);
+            setTimeout(function() {
+                dispatchEvent(handle, 'mouseup', createEvent('mouseup', handle, { clientX: x, clientY: y + moveVerticalAmount }));
+            }, mouseUpAfter);
+        };
+
+        // iterate and move each matched element
+        return this.each(applyDrag);
+    };
+
+    // fire mouse events, go half way, then the next half, so small mouse movements near target and big at the start
+    function slideUpTo(x, y, targetOffset, goPastBy) {
+        var moveBy, offset;
+
+        if (!goPastBy) { goPastBy = 0; }
+        if ((targetOffset < 0) && (goPastBy > 0)) { goPastBy = -goPastBy; } // ensure go past is in the direction as often passed in from object height so always positive
+
+        // go forwards including goPastBy
+        for (offset = 0; Math.abs(offset) + 1 < Math.abs(targetOffset + goPastBy); offset += ((targetOffset + goPastBy - offset)/2) ) {
+            dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y + Math.ceil(offset) }));
+        }
+        offset = targetOffset + goPastBy;
+        dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y + offset }));
+
+        // now bounce back
+        for (; Math.abs(offset) - 1 >= Math.abs(targetOffset); offset += ((targetOffset - offset)/2) ) {
+            dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y + Math.ceil(offset) }));
+        }
+        dispatchEvent(document, 'mousemove', createEvent('mousemove', document, { clientX: x, clientY: y + targetOffset }));
+    }
+
+    function createEvent(type, target, options) {
+        var evt;
+        var e = $.extend({
+            target: target,
+            preventDefault: function() { },
+            stopImmediatePropagation: function() { },
+            stopPropagation: function() { },
+            isPropagationStopped: function() { return true; },
+            isImmediatePropagationStopped: function() { return true; },
+            isDefaultPrevented: function() { return true; },
+            bubbles: true,
+            cancelable: (type != "mousemove"),
+            view: window,
+            detail: 0,
+            screenX: 0,
+            screenY: 0,
+            clientX: 0,
+            clientY: 0,
+            ctrlKey: false,
+            altKey: false,
+            shiftKey: false,
+            metaKey: false,
+            button: 0,
+            relatedTarget: undefined
+        }, options || {});
+
+        if ($.isFunction(document.createEvent)) {
+            evt = document.createEvent("MouseEvents");
+            evt.initMouseEvent(type, e.bubbles, e.cancelable, e.view, e.detail,
+                e.screenX, e.screenY, e.clientX, e.clientY,
+                e.ctrlKey, e.altKey, e.shiftKey, e.metaKey,
+                e.button, e.relatedTarget || document.body.parentNode);
+        } else if (document.createEventObject) {
+            evt = document.createEventObject();
+            $.extend(evt, e);
+            evt.button = { 0:1, 1:4, 2:2 }[evt.button] || evt.button;
+        }
+        return evt;
+    }
+
+    function dispatchEvent(el, type, evt) {
+        if (el.dispatchEvent) {
+            el.dispatchEvent(evt);
+        } else if (el.fireEvent) {
+            el.fireEvent('on' + type, evt);
+        }
+        return evt;
+    }
+
+    function findCenter(el) {
+        var elm = $(el),
+            o = elm.offset();
+        return {
+            x: o.left + elm.outerWidth() / 2,
+            y: o.top + elm.outerHeight() / 2
+        };
+    }
+
+    //
+    // plugin defaults
+    //
+    $.fn.simulateDragSortable.defaults = {
+        move: 0
+    };
+})(jQuery);

data/spec/features/drag_and_drop_spec.rb

@@ -1,43 +1,66 @@
-RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
+RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature, js: true do
   before do
     Category.create!
     Category.create!
     Category.create!
   end
 
-  def ordered_elements
+  def ordered_ids
     Category.order(:position).pluck(:id)
   end
 
   context 'first page' do
-    it 'reorders elements by dragging vertically by handle', js: true do
-      expect(ordered_elements).to eq([1, 2, 3])
+    before do
+      expect(ordered_ids).to eq([1, 2, 3])
 
       visit admin_categories_path
 
-      expect(visible_elements).to eq([1, 2, 3])
+      expect(visible_ids).to eq([1, 2, 3])
       expect(visible_positions).to eq([1, 2, 3])
+    end
 
-      move_higher(2, by_handle: true)
+    context 'move element up' do
+      it 'to the top position' do
+        move_up(3, by: 2)
 
-      expect(visible_elements).to eq([2, 1, 3])
-      expect(visible_positions).to eq([1, 2, 3])
-      expect(ordered_elements).to eq([2, 1, 3])
+        expect(visible_ids).to eq([3, 1, 2])
+        expect(visible_positions).to eq([1, 2, 3])
+        expect(ordered_ids).to eq([3, 1, 2])
+      end
+
+      it 'to the middle of the table' do
+        move_up(3, by: 1)
+
+        expect(visible_ids).to eq([1, 3, 2])
+        expect(visible_positions).to eq([1, 2, 3])
+        expect(ordered_ids).to eq([1, 3, 2])
+      end
     end
 
-    it 'does not reorder elements by dragging vertically by row', js: true do
-      expect(ordered_elements).to eq([1, 2, 3])
+    context 'move element down' do
+      it 'to the bottom of the table' do
+        move_down(1, by: 2)
 
-      visit admin_categories_path
+        expect(visible_ids).to eq([2, 3, 1])
+        expect(visible_positions).to eq([1, 2, 3])
+        expect(ordered_ids).to eq([2, 3, 1])
+      end
 
-      expect(visible_elements).to eq([1, 2, 3])
-      expect(visible_positions).to eq([1, 2, 3])
+      it 'to the middle of the table' do
+        move_down(2, by: 1)
+
+        expect(visible_ids).to eq([1, 3, 2])
+        expect(visible_positions).to eq([1, 2, 3])
+        expect(ordered_ids).to eq([1, 3, 2])
+      end
+    end
 
-      move_higher(2, by_handle: false)
+    it 'can not drug not by handle' do
+      move_up(3, by: 2, use_handle: false)
 
-      expect(visible_elements).to eq([1, 2, 3])
+      expect(visible_ids).to eq([1, 2, 3])
       expect(visible_positions).to eq([1, 2, 3])
-      expect(ordered_elements).to eq([1, 2, 3])
+      expect(ordered_ids).to eq([1, 2, 3])
     end
   end
 
@@ -48,40 +71,63 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
       Category.create!
     end
 
-    it 'reorders elements by dragging vertically by handle', js: true do
-      expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
+    before do
+      expect(ordered_ids).to eq([1, 2, 3, 4, 5, 6])
 
       visit admin_categories_path(page: 2)
 
-      expect(visible_elements).to eq([4, 5, 6])
+      expect(visible_ids).to eq([4, 5, 6])
       expect(visible_positions).to eq([4, 5, 6])
+    end
 
-      move_higher(5, by_handle: true)
+    context 'move element up' do
+      it 'to the top position' do
+        move_up(6, by: 2)
 
-      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])
+        expect(visible_ids).to eq([6, 4, 5])
+        expect(visible_positions).to eq([4, 5, 6])
+        expect(ordered_ids).to eq([1, 2, 3, 6, 4, 5])
+      end
+
+      it 'to the middle of the table' do
+        move_up(6, by: 1)
+
+        expect(visible_ids).to eq([4, 6, 5])
+        expect(visible_positions).to eq([4, 5, 6])
+        expect(ordered_ids).to eq([1, 2, 3, 4, 6, 5])
+      end
     end
 
-    it 'does not reorder elements by dragging vertically by row', js: true do
-      expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
+    context 'move element down' do
+      it 'to the bottom of the table' do
+        move_down(4, by: 2)
 
-      visit admin_categories_path(page: 2)
+        expect(visible_ids).to eq([5, 6, 4])
+        expect(visible_positions).to eq([4, 5, 6])
+        expect(ordered_ids).to eq([1, 2, 3, 5, 6, 4])
+      end
 
-      expect(visible_elements).to eq([4, 5, 6])
-      expect(visible_positions).to eq([4, 5, 6])
+      it 'to the middle of the table' do
+        move_down(4, by: 1)
 
-      move_higher(5, by_handle: false)
+        expect(visible_ids).to eq([5, 4, 6])
+        expect(visible_positions).to eq([4, 5, 6])
+        expect(ordered_ids).to eq([1, 2, 3, 5, 4, 6])
+      end
+    end
+
+    it 'can not drug not by handle' do
+      move_down(6, by: 2, use_handle: false)
 
-      expect(visible_elements).to eq([4, 5, 6])
+      expect(visible_ids).to eq([4, 5, 6])
       expect(visible_positions).to eq([4, 5, 6])
-      expect(ordered_elements).to eq([1, 2, 3, 4, 5, 6])
+      expect(ordered_ids).to eq([1, 2, 3, 4, 5, 6])
     end
   end
 
   private
 
-  def visible_elements
+  def visible_ids
     all('.ui-sortable .col-id').map(&:text).map(&:to_i)
   end
 
@@ -89,14 +135,24 @@ RSpec.describe ActiveAdmin::SortableTable, 'Drag-and-Drop', type: :feature do
     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)
+  def move_up(element_id, by: 1, use_handle: true)
+    drag_element(element_id, by: -by, use_handle: use_handle)
   end
 
-  def drag_element(element_id, by_handle, options)
-    options.reverse_merge! moves: 20
-    selector = by_handle ? "#category_#{element_id} .handle" : "#category_#{element_id}"
-    page.execute_script(%($("#{selector}").simulate("drag", #{options.to_json})))
-    sleep 0.1
+  def move_down(element_id, by: 1, use_handle: true)
+    drag_element(element_id, by: by, use_handle: use_handle)
+  end
+
+  def drag_element(element_id, by:, use_handle:)
+    if use_handle
+      page.execute_script(<<-JS)
+        $("#category_#{element_id}").simulateDragSortable({ move: #{by}, handle: ".handle" })
+      JS
+    else
+      page.execute_script(<<-JS)
+        $("#category_#{element_id}").simulateDragSortable({ move: #{by} })
+      JS
+    end
+    sleep 0.5
   end
 end

data/spec/features/move_to_top_spec.rb

@@ -1,4 +1,4 @@
-RSpec.describe ActiveAdmin::SortableTable, 'Move to top', type: :feature do
+RSpec.describe ActiveAdmin::SortableTable, 'Move to top', type: :feature, js: true do
   before do
     Category.create!
     Category.create!
@@ -6,39 +6,47 @@ RSpec.describe ActiveAdmin::SortableTable, 'Move to top', type: :feature do
     Category.create!
   end
 
-  def ordered_elements
+  def ordered_ids
     Category.order(:position).pluck(:id)
   end
 
-  it 'push element to top by clicking "move to top"', js: true do
-    expect(ordered_elements).to eq([1, 2, 3, 4])
+  before do
+    expect(ordered_ids).to eq([1, 2, 3, 4])
 
     # Initially only one element on the second page
     visit admin_categories_path(page: 2)
 
-    expect(visible_elements).to contain_exactly(4)
+    expect(visible_ids).to contain_exactly(4)
+    expect(visible_positions).to contain_exactly(4)
+  end
 
+  it 'push element to top by clicking "move to top"' do
     # When I push "move to top" button
     move_to_top(4)
 
     # The last element from the previous page should be shown
     # save_and_open_page
-    expect(visible_elements).to contain_exactly(3)
+    expect(visible_ids).to contain_exactly(3)
 
     # And when I visit previous page
     visit admin_categories_path(page: 1)
 
     # I should see pushed elenent on the top
-    expect(visible_elements).to eq([4, 1, 2])
-    expect(ordered_elements).to eq([4, 1, 2, 3])
+    expect(visible_ids).to eq([4, 1, 2])
+    expect(visible_positions).to eq([1, 2, 3])
+    expect(ordered_ids).to eq([4, 1, 2, 3])
   end
 
   private
 
-  def visible_elements
+  def visible_ids
     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_to_top(element_id)
     within "#category_#{element_id}" do
       first('.move_to_top').click

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_sortable_table
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -172,7 +172,7 @@ files:
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/active_admin.js.coffee
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/jquery.simulate.js
+- spec/dummy/app/assets/javascripts/jquery.simulate.drag-sortable.js
 - spec/dummy/app/assets/stylesheets/active_admin.scss
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Drag and drop reordering interface for ActiveAdmin tables
@@ -254,7 +254,7 @@ test_files:
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/active_admin.js.coffee
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/javascripts/jquery.simulate.js
+- spec/dummy/app/assets/javascripts/jquery.simulate.drag-sortable.js
 - spec/dummy/app/assets/stylesheets/active_admin.scss
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb

data/spec/dummy/app/assets/javascripts/jquery.simulate.js

@@ -1,314 +0,0 @@
- /*!
- * jQuery Simulate v@VERSION - simulate browser mouse and keyboard events
- * https://github.com/jquery/jquery-simulate
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: @DATE
- */
-
-;(function( $, undefined ) {
-
-var rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/;
-
-$.fn.simulate = function( type, options ) {
-	return this.each(function() {
-		new $.simulate( this, type, options );
-	});
-};
-
-$.simulate = function( elem, type, options ) {
-	var method = $.camelCase( "simulate-" + type );
-
-	this.target = elem;
-	this.options = options;
-
-	if ( this[ method ] ) {
-		this[ method ]();
-	} else {
-		this.simulateEvent( elem, type, options );
-	}
-};
-
-$.extend( $.simulate, {
-
-	keyCode: {
-		BACKSPACE: 8,
-		COMMA: 188,
-		DELETE: 46,
-		DOWN: 40,
-		END: 35,
-		ENTER: 13,
-		ESCAPE: 27,
-		HOME: 36,
-		LEFT: 37,
-		NUMPAD_ADD: 107,
-		NUMPAD_DECIMAL: 110,
-		NUMPAD_DIVIDE: 111,
-		NUMPAD_ENTER: 108,
-		NUMPAD_MULTIPLY: 106,
-		NUMPAD_SUBTRACT: 109,
-		PAGE_DOWN: 34,
-		PAGE_UP: 33,
-		PERIOD: 190,
-		RIGHT: 39,
-		SPACE: 32,
-		TAB: 9,
-		UP: 38
-	},
-
-	buttonCode: {
-		LEFT: 0,
-		MIDDLE: 1,
-		RIGHT: 2
-	}
-});
-
-$.extend( $.simulate.prototype, {
-
-	simulateEvent: function( elem, type, options ) {
-		var event = this.createEvent( type, options );
-		this.dispatchEvent( elem, type, event, options );
-	},
-
-	createEvent: function( type, options ) {
-		if ( rkeyEvent.test( type ) ) {
-			return this.keyEvent( type, options );
-		}
-
-		if ( rmouseEvent.test( type ) ) {
-			return this.mouseEvent( type, options );
-		}
-	},
-
-	mouseEvent: function( type, options ) {
-		var event, eventDoc, doc, body;
-		options = $.extend({
-			bubbles: true,
-			cancelable: (type !== "mousemove"),
-			view: window,
-			detail: 0,
-			screenX: 0,
-			screenY: 0,
-			clientX: 1,
-			clientY: 1,
-			ctrlKey: false,
-			altKey: false,
-			shiftKey: false,
-			metaKey: false,
-			button: 0,
-			relatedTarget: undefined
-		}, options );
-
-		if ( document.createEvent ) {
-			event = document.createEvent( "MouseEvents" );
-			event.initMouseEvent( type, options.bubbles, options.cancelable,
-				options.view, options.detail,
-				options.screenX, options.screenY, options.clientX, options.clientY,
-				options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-				options.button, options.relatedTarget || document.body.parentNode );
-
-			// IE 9+ creates events with pageX and pageY set to 0.
-			// Trying to modify the properties throws an error,
-			// so we define getters to return the correct values.
-			if ( event.pageX === 0 && event.pageY === 0 && Object.defineProperty ) {
-				eventDoc = event.relatedTarget.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				Object.defineProperty( event, "pageX", {
-					get: function() {
-						return options.clientX +
-							( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
-							( doc && doc.clientLeft || body && body.clientLeft || 0 );
-					}
-				});
-				Object.defineProperty( event, "pageY", {
-					get: function() {
-						return options.clientY +
-							( doc && doc.scrollTop || body && body.scrollTop || 0 ) -
-							( doc && doc.clientTop || body && body.clientTop || 0 );
-					}
-				});
-			}
-		} else if ( document.createEventObject ) {
-			event = document.createEventObject();
-			$.extend( event, options );
-			// standards event.button uses constants defined here: http://msdn.microsoft.com/en-us/library/ie/ff974877(v=vs.85).aspx
-			// old IE event.button uses constants defined here: http://msdn.microsoft.com/en-us/library/ie/ms533544(v=vs.85).aspx
-			// so we actually need to map the standard back to oldIE
-			event.button = {
-				0: 1,
-				1: 4,
-				2: 2
-			}[ event.button ] || event.button;
-		}
-
-		return event;
-	},
-
-	keyEvent: function( type, options ) {
-		var event;
-		options = $.extend({
-			bubbles: true,
-			cancelable: true,
-			view: window,
-			ctrlKey: false,
-			altKey: false,
-			shiftKey: false,
-			metaKey: false,
-			keyCode: 0,
-			charCode: undefined
-		}, options );
-
-		if ( document.createEvent ) {
-			try {
-				event = document.createEvent( "KeyEvents" );
-				event.initKeyEvent( type, options.bubbles, options.cancelable, options.view,
-					options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-					options.keyCode, options.charCode );
-			// initKeyEvent throws an exception in WebKit
-			// see: http://stackoverflow.com/questions/6406784/initkeyevent-keypress-only-works-in-firefox-need-a-cross-browser-solution
-			// and also https://bugs.webkit.org/show_bug.cgi?id=13368
-			// fall back to a generic event until we decide to implement initKeyboardEvent
-			} catch( err ) {
-				event = document.createEvent( "Events" );
-				event.initEvent( type, options.bubbles, options.cancelable );
-				$.extend( event, {
-					view: options.view,
-					ctrlKey: options.ctrlKey,
-					altKey: options.altKey,
-					shiftKey: options.shiftKey,
-					metaKey: options.metaKey,
-					keyCode: options.keyCode,
-					charCode: options.charCode
-				});
-			}
-		} else if ( document.createEventObject ) {
-			event = document.createEventObject();
-			$.extend( event, options );
-		}
-
-		if ( !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) || (({}).toString.call( window.opera ) === "[object Opera]") ) {
-			event.keyCode = (options.charCode > 0) ? options.charCode : options.keyCode;
-			event.charCode = undefined;
-		}
-
-		return event;
-	},
-
-	dispatchEvent: function( elem, type, event ) {
-		if ( elem[ type ] ) {
-			elem[ type ]();
-		} else if ( elem.dispatchEvent ) {
-			elem.dispatchEvent( event );
-		} else if ( elem.fireEvent ) {
-			elem.fireEvent( "on" + type, event );
-		}
-	},
-
-	simulateFocus: function() {
-		var focusinEvent,
-			triggered = false,
-			element = $( this.target );
-
-		function trigger() {
-			triggered = true;
-		}
-
-		element.bind( "focus", trigger );
-		element[ 0 ].focus();
-
-		if ( !triggered ) {
-			focusinEvent = $.Event( "focusin" );
-			focusinEvent.preventDefault();
-			element.trigger( focusinEvent );
-			element.triggerHandler( "focus" );
-		}
-		element.unbind( "focus", trigger );
-	},
-
-	simulateBlur: function() {
-		var focusoutEvent,
-			triggered = false,
-			element = $( this.target );
-
-		function trigger() {
-			triggered = true;
-		}
-
-		element.bind( "blur", trigger );
-		element[ 0 ].blur();
-
-		// blur events are async in IE
-		setTimeout(function() {
-			// IE won't let the blur occur if the window is inactive
-			if ( element[ 0 ].ownerDocument.activeElement === element[ 0 ] ) {
-				element[ 0 ].ownerDocument.body.focus();
-			}
-
-			// Firefox won't trigger events if the window is inactive
-			// IE doesn't trigger events if we had to manually focus the body
-			if ( !triggered ) {
-				focusoutEvent = $.Event( "focusout" );
-				focusoutEvent.preventDefault();
-				element.trigger( focusoutEvent );
-				element.triggerHandler( "blur" );
-			}
-			element.unbind( "blur", trigger );
-		}, 1 );
-	}
-});
-
-
-
-/** complex events **/
-
-function findCenter( elem ) {
-	var offset,
-		document = $( elem.ownerDocument );
-	elem = $( elem );
-	offset = elem.offset();
-
-	return {
-		x: offset.left + elem.outerWidth() / 2 - document.scrollLeft(),
-		y: offset.top + elem.outerHeight() / 2 - document.scrollTop()
-	};
-}
-
-$.extend( $.simulate.prototype, {
-	simulateDrag: function() {
-		var i = 0,
-			target = this.target,
-			options = this.options,
-			center = findCenter( target ),
-			x = Math.floor( center.x ),
-			y = Math.floor( center.y ),
-			dx = options.dx || 0,
-			dy = options.dy || 0,
-			moves = options.moves || 3,
-			coord = { clientX: x, clientY: y };
-
-		this.simulateEvent( target, "mousedown", coord );
-
-		for ( ; i < moves ; i++ ) {
-			x += dx / moves;
-			y += dy / moves;
-
-			coord = {
-				clientX: Math.round( x ),
-				clientY: Math.round( y )
-			};
-
-			this.simulateEvent( document, "mousemove", coord );
-		}
-
-		this.simulateEvent( target, "mouseup", coord );
-		this.simulateEvent( target, "click", coord );
-	}
-});
-
-})( jQuery );