From 4de269e53f5d3c313142d5d21c5c7ada314fa5ca Mon Sep 17 00:00:00 2001
From: Ed <edchipman@gmail.com>
Date: Fri, 26 Apr 2013 20:25:56 -0300
Subject: [PATCH] Resolved issue #33 when sorting to page the to page sort was
 called first then the on page sort was called which caused the indexes to
 become confused

---
 javascript/GridFieldSortableRows.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/javascript/GridFieldSortableRows.js b/javascript/GridFieldSortableRows.js
index d93f134..cfde054 100644
--- a/javascript/GridFieldSortableRows.js
+++ b/javascript/GridFieldSortableRows.js
@@ -5,6 +5,7 @@
 				var self=this;
 				var refCheckbox=$(this);
 				var gridField=this.getGridField();
+				var pageSort=false;
 				
 				if($(this).is(':checked')) {
 					gridField.find('table').addClass('dragSorting');
@@ -24,6 +25,11 @@
 													return ui;
 												},
 												update: function(event, ui) {
+													if(pageSort) {
+														pageSort=false;
+														return;
+													}
+													
 													var dataRows=[];
 													var gridItems=gridField.getItems();
 													var button=refCheckbox.parent().find('.sortablerows-toggle');
@@ -54,8 +60,7 @@
 																			activeClass: 'sortablerows-droptarget',
 																			tolerance: 'pointer',
 																			drop: function(event, ui) {
-																				event.stopPropagation();
-																				event.stopImmediatePropagation();
+																				pageSort=true;
 																				
 																				var button=refCheckbox.parent().find('.sortablerows-sorttopage');
 																				var itemID=$(ui.draggable).data('id');