cancel sortable operation, so KO can take care of DOM manipulation, w…

…hich ensures in KO 3+ that everything is disposed properly.

bower.json

@@ -1,6 +1,6 @@
 {
  "name": "knockout-sortable",
- "version": "0.8.7",
+ "version": "0.8.8",
  "main": "./build/knockout-sortable.min.js",
  "ignore": [
  "examples",

build/knockout-sortable.js

@@ -1,4 +1,4 @@
-// knockout-sortable 0.8.7 | (c) 2014 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
+// knockout-sortable 0.8.8 | (c) 2014 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
 ;(function(factory) {
  if (typeof define === "function" && define.amd) {
  // AMD anonymous module
@@ -174,6 +174,7 @@
  targetIndex = updateIndexFromDestroyedItems(targetIndex, targetParent);
  }
 
+ //build up args for the callbacks
  if (sortable.beforeMove || sortable.afterMove) {
  arg = {
  item: item,
@@ -184,31 +185,32 @@
  targetIndex: targetIndex,
  cancelDrop: false
  };
+
+ //execute the configured callback prior to actually moving items
+ if (sortable.beforeMove) {
+ sortable.beforeMove.call(this, arg, event, ui);
+ }
  }
 
- if (sortable.beforeMove) {
- sortable.beforeMove.call(this, arg, event, ui);
- if (arg.cancelDrop) {
- //call cancel on the correct list
- if (arg.sourceParent) {
- $(arg.sourceParent === arg.targetParent ? this : ui.sender).sortable("cancel");
- }
- //for a draggable item just remove the element
- else {
- $(el).remove();
- }
+ //call cancel on the correct list, so KO can take care of DOM manipulation
+ if (sourceParent) {
+ $(sourceParent === targetParent ? this : ui.sender).sortable("cancel");
+ }
+ //for a draggable item just remove the element
+ else {
+ $(el).remove();
+ }
 
- return;
- }
+ //if beforeMove told us to cancel, then we are done
+ if (arg && arg.cancelDrop) {
+ return;
  }
 
+ //do the actual move
  if (targetIndex >= 0) {
  if (sourceParent) {
  sourceParent.splice(sourceIndex, 1);
 
- //in KO 3+, nodes outside of the original parent aren't found when trying to dispose, need to do this manually
- ko.removeNode(el);
-
  //if using deferred updates plugin, force updates
  if (ko.processAllDeferredBindingUpdates) {
  ko.processAllDeferredBindingUpdates();
@@ -220,7 +222,6 @@
 
  //rendering is handled by manipulating the observableArray; ignore dropped element
  dataSet(el, ITEMKEY, null);
- ui.item.remove();
 
  //if using deferred updates plugin, force updates
  if (ko.processAllDeferredBindingUpdates) {

package.json

@@ -1,6 +1,6 @@
 {
  "name": "knockout-sortable",
- "version": "0.8.7",
+ "version": "0.8.8",
  "devDependencies": {
  "grunt": "~0.4.1",
  "grunt-contrib-uglify": "0.x.x",

src/knockout-sortable.js

@@ -173,6 +173,7 @@
  targetIndex = updateIndexFromDestroyedItems(targetIndex, targetParent);
  }
 
+ //build up args for the callbacks
  if (sortable.beforeMove || sortable.afterMove) {
  arg = {
  item: item,
@@ -183,31 +184,32 @@
  targetIndex: targetIndex,
  cancelDrop: false
  };
+
+ //execute the configured callback prior to actually moving items
+ if (sortable.beforeMove) {
+ sortable.beforeMove.call(this, arg, event, ui);
+ }
  }
 
- if (sortable.beforeMove) {
- sortable.beforeMove.call(this, arg, event, ui);
- if (arg.cancelDrop) {
- //call cancel on the correct list
- if (arg.sourceParent) {
- $(arg.sourceParent === arg.targetParent ? this : ui.sender).sortable("cancel");
- }
- //for a draggable item just remove the element
- else {
- $(el).remove();
- }
+ //call cancel on the correct list, so KO can take care of DOM manipulation
+ if (sourceParent) {
+ $(sourceParent === targetParent ? this : ui.sender).sortable("cancel");
+ }
+ //for a draggable item just remove the element
+ else {
+ $(el).remove();
+ }
 
- return;
- }
+ //if beforeMove told us to cancel, then we are done
+ if (arg && arg.cancelDrop) {
+ return;
  }
 
+ //do the actual move
  if (targetIndex >= 0) {
  if (sourceParent) {
  sourceParent.splice(sourceIndex, 1);
 
- //in KO 3+, nodes outside of the original parent aren't found when trying to dispose, need to do this manually
- ko.removeNode(el);
-
  //if using deferred updates plugin, force updates
  if (ko.processAllDeferredBindingUpdates) {
  ko.processAllDeferredBindingUpdates();
@@ -219,7 +221,6 @@
 
  //rendering is handled by manipulating the observableArray; ignore dropped element
  dataSet(el, ITEMKEY, null);
- ui.item.remove();
 
  //if using deferred updates plugin, force updates
  if (ko.processAllDeferredBindingUpdates) {