make extra removeNode call to ensure that moved nodes are disposed pr…

…operly in KO 3+ fixes #104
rniemeyer · Jun 16, 2014 · 451880d · 451880d
1 parent 9323854
commit 451880d
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 106 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "knockout-sortable",
-    "version": "0.8.6",
+    "version": "0.8.7",
     "main": "./build/knockout-sortable.min.js",
     "ignore": [
         "examples",

diff --git a/build/knockout-sortable.js b/build/knockout-sortable.js
@@ -1,4 +1,4 @@
-// knockout-sortable 0.8.6 | (c) 2014 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
+// knockout-sortable 0.8.7 | (c) 2014 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
 ;(function(factory) {
     if (typeof define === "function" && define.amd) {
         // AMD anonymous module
@@ -191,7 +191,7 @@
                                 if (arg.cancelDrop) {
                                     //call cancel on the correct list
                                     if (arg.sourceParent) {
-                                        $(arg.sourceParent === arg.targetParent ? this : ui.sender).sortable('cancel');
+                                        $(arg.sourceParent === arg.targetParent ? this : ui.sender).sortable("cancel");
                                     }
                                     //for a draggable item just remove the element
                                     else {
@@ -206,6 +206,9 @@
                                 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();

diff --git a/build/knockout-sortable.min.js b/build/knockout-sortable.min.js
diff --git a/examples/connectedLists.html b/examples/connectedLists.html
@@ -7,7 +7,7 @@
     <script type='text/javascript' src='../ext/jquery-1.9.1.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-3.0.0.js"></script>
+    <script type='text/javascript' src="../ext/knockout-3.1.0.js"></script>
     <script type='text/javascript' src="../build/knockout-sortable.min.js"></script>
 
     <style type='text/css'>

diff --git a/examples/draggable.html b/examples/draggable.html
@@ -7,7 +7,7 @@
     <script type='text/javascript' src='../ext/jquery-1.9.1.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-3.0.0.js"></script>
+    <script type='text/javascript' src="../ext/knockout-3.1.0.js"></script>
     <script type='text/javascript' src="../build/knockout-sortable.min.js"></script>
 
     <style type='text/css'>

diff --git a/examples/seatingChart.html b/examples/seatingChart.html
@@ -57,7 +57,7 @@
 
     <script type='text/javascript' src='../ext/jquery-1.9.1.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.js"></script>
-    <script type='text/javascript' src="../ext/knockout-3.0.0.js"></script>
+    <script type='text/javascript' src="../ext/knockout-3.1.0.js"></script>
     <script type='text/javascript' src="../build/knockout-sortable.min.js"></script>
     <script type='text/javascript' src="seatingChart.js"></script>
 </body>

diff --git a/examples/singleList.html b/examples/singleList.html
@@ -7,7 +7,7 @@
     <script type='text/javascript' src='../ext/jquery-1.9.1.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-3.0.0.js"></script>
+    <script type='text/javascript' src="../ext/knockout-3.1.0.js"></script>
     <script type='text/javascript' src="../build/knockout-sortable.js"></script>
 
     <style type='text/css'>