Update reference to KO 2.2.

apuchkov · Nov 27, 2012 · b8155e4 · b8155e4
1 parent 13fdad7
commit b8155e4
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 3,454 deletions.
diff --git a/build/knockout-sortable.js b/build/knockout-sortable.js
@@ -1,4 +1,4 @@
-//knockout-sortable 0.6.7 | (c) 2012 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
+//knockout-sortable 0.7.0 | (c) 2012 Ryan Niemeyer | http://www.opensource.org/licenses/mit-license
 (function(factory) {
     if (typeof define === "function" && define.amd) {
         // AMD anonymous module
@@ -105,7 +105,7 @@
             updateActual = sortable.options.update;
 
             //initialize sortable binding after template binding has rendered in update function
-            setTimeout(function() {
+            var createTimeout = setTimeout(function() {
                 var dragItem;
                 $element.sortable(ko.utils.extend(sortable.options, {
                     start: function(event, ui) {
@@ -221,7 +221,13 @@
 
             //handle disposal
             ko.utils.domNodeDisposal.addDisposeCallback(element, function() {
-                $element.sortable("destroy");
+                //only call destroy if sortable has been created
+                if ($element.data("sortable")) {
+                    $element.sortable("destroy");
+                }
+
+                //do not create the sortable if the element has been removed from DOM
+                clearTimeout(createTimeout);
             });
 
             return { 'controlsDescendantBindings': true };
@@ -261,7 +267,6 @@
             ko.utils.extend(draggableOptions, options);
 
             //setup connection to a sortable
-
             draggableOptions.connectToSortable = connectClass ? "." + connectClass : false;
 
             //initialize draggable

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.7.1.min.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.min.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-2.1.0.debug.js"></script>
+    <script type='text/javascript' src="../ext/knockout-2.2.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.7.1.min.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.min.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-2.1.0.debug.js"></script>
+    <script type='text/javascript' src="../ext/knockout-2.2.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.7.1.min.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.min.js"></script>
-    <script type='text/javascript' src="../ext/knockout-2.1.0.debug.js"></script>
+    <script type='text/javascript' src="../ext/knockout-2.2.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.7.1.min.js'></script>
     <script type="text/javascript" src="../ext/jquery-ui.min.js"></script>
 
-    <script type='text/javascript' src="../ext/knockout-2.1.0.debug.js"></script>
+    <script type='text/javascript' src="../ext/knockout-2.2.0.js"></script>
     <script type='text/javascript' src="../build/knockout-sortable.min.js"></script>
 
     <style type='text/css'>