Bug fix in endDrag function

Complete callback was called before placeholder was removed. And if toArray callback was called in complete callback, placeholder was included in result.

Author: camohub

bower.json

@@ -4,7 +4,7 @@
   "dependencies": {
     "jquery": ">=1"
   },
-  "version": "1.0.10",
+  "version": "1.0.11",
   "homepage": "[email protected]:camohub/jquery-sortable-lists.git",
   "authors": [
     "Vladimír Čamaj <[email protected]>"

jquery-sortable-lists.js

@@ -66,34 +66,34 @@
 
 			setting = $.extend( true, {}, defaults, options ),
 
-		// base element from which is counted position of draged element
+			// base element from which is counted position of draged element
 			base = $( '<' + setting.listSelector + ' />' )
 				.prependTo( jQBody )
 				.attr( 'id', 'sortableListsBase' )
 				.css( setting.baseCss )
 				.addClass( setting.listsClass + ' ' + setting.baseClass ),
 
-		// placeholder != state.placeholderNode
-		// placeholder is document fragment and state.placeholderNode is document node
+			// placeholder != state.placeholderNode
+			// placeholder is document fragment and state.placeholderNode is document node
 			placeholder = $( '<li />' )
 				.attr( 'id', 'sortableListsPlaceholder' )
 				.css( setting.placeholderCss )
 				.addClass( setting.placeholderClass ),
 
-		// hint is document fragment
+			// hint is document fragment
 			hint = $( '<li />' )
 				.attr( 'id', 'sortableListsHint' )
 				.css( setting.hintCss )
 				.addClass( setting.hintClass ),
 
-		// Is document fragment used as wrapper if hint is inserted to the empty li
+			// Is document fragment used as wrapper if hint is inserted to the empty li
 			hintWrapper = $( '<' + setting.listSelector + ' />' )
 				.attr( 'id', 'sortableListsHintWrapper' )
 				.addClass( setting.listsClass + ' ' + setting.hintWrapperClass )
 				.css( setting.listsCss )
 				.css( setting.hintWrapperCss ),
 
-		// Is +/- ikon to open/close nested lists
+			// Is +/- ikon to open/close nested lists
 			opener = $( '<span />' )
 				.addClass( 'sortableListsOpener ' + setting.opener.openerClass )
 				.css( 'background-image', 'url(' + setting.opener.close + ')' )
@@ -108,7 +108,7 @@
 					return false; // Prevent default
 				}),
 
-		// Container with all actual elements and parameters
+			// Container with all actual elements and parameters
 			state = {
 				isDragged: false,
 				isRelEFP: null,  // How browser counts elementFromPoint() position (relative to window/document)
@@ -212,7 +212,7 @@
 				'top': elXY.top - elMT,
 				'left': elXY.left - elML
 			})
-				.prependTo( base );
+			.prependTo( base );
 
 			placeholderNode.css({
 				'display': 'block',
@@ -345,18 +345,18 @@
 						{
 							state.placeholderNode.remove();
 							tidyEmptyLists();
+							setting.complete( cEl.el ); // Have to be here cause is necessary to remove placeholder before complete call.
+							state.isDragged = false;
 						});
 					}
 					else
 					{
 						state.placeholderNode.remove();
 						tidyEmptyLists();
+						setting.complete( cEl.el );
+						state.isDragged = false;
 					}
 
-					setting.complete( cEl.el );
-
-					state.isDragged = false;
-
 				});
 
 			scrollStop( state );
@@ -818,7 +818,6 @@
 			}
 
 			arr.push( matches[1] + '[' + matches[2] + ']=' + parentId );
-
 			$( this ).children( 'ul,ol' ).sortableListsToString( arr, matches[2] );
 
 		});