From 9b70f32921b6017469dba41456797d0e377507be Mon Sep 17 00:00:00 2001 From: alexk111 Date: Sat, 4 Jun 2016 13:32:10 +0700 Subject: [PATCH 1/3] Fix Destroy workflow --- Sortable.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Sortable.js b/Sortable.js index d271999..a194f72 100644 --- a/Sortable.js +++ b/Sortable.js @@ -813,9 +813,8 @@ this.save(); } } - + this._nulling(); } - this._nulling(); }, _nulling: function() { From d497e64ca9a52a49fa0065c7f7ed8084f8a9f513 Mon Sep 17 00:00:00 2001 From: Lebedev Konstantin Date: Wed, 22 Jun 2016 10:48:14 +0300 Subject: [PATCH 2/3] #864: + check Sortable.active in nulling method --- Sortable.js | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/Sortable.js b/Sortable.js index d271999..66b489c 100644 --- a/Sortable.js +++ b/Sortable.js @@ -815,32 +815,34 @@ } } + this._nulling(); }, _nulling: function() { - // Nulling - rootEl = - dragEl = - parentEl = - ghostEl = - nextEl = - cloneEl = + if (Sortable.active === this) { + rootEl = + dragEl = + parentEl = + ghostEl = + nextEl = + cloneEl = - scrollEl = - scrollParentEl = + scrollEl = + scrollParentEl = - tapEvt = - touchEvt = + tapEvt = + touchEvt = - moved = - newIndex = + moved = + newIndex = - lastEl = - lastCSS = + lastEl = + lastCSS = - activeGroup = - Sortable.active = null; + activeGroup = + Sortable.active = null; + } }, handleEvent: function (/**Event*/evt) { From caf43c8799e46051a2e6ae26cde69410e700d965 Mon Sep 17 00:00:00 2001 From: Lebedev Konstantin Date: Fri, 24 Jun 2016 15:06:20 +0300 Subject: [PATCH 3/3] Revert "Fix Destroy workflow" --- Sortable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sortable.js b/Sortable.js index f290782..d6f0423 100644 --- a/Sortable.js +++ b/Sortable.js @@ -813,8 +813,9 @@ this.save(); } } - this._nulling(); + } + this._nulling(); }, _nulling: function() {