From 4ba860ea8ca5d1102a2847721842152dd352ebdf Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 26 Aug 2014 14:32:21 -0600 Subject: [PATCH] fix(sortable): don't trigger sort when dragging in place, fixes #3926 --- public/js/controllers/filtersCtrl.js | 6 +++--- public/js/controllers/tasksCtrl.js | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/js/controllers/filtersCtrl.js b/public/js/controllers/filtersCtrl.js index 8f665eaba4..71056016c1 100644 --- a/public/js/controllers/filtersCtrl.js +++ b/public/js/controllers/filtersCtrl.js @@ -41,9 +41,9 @@ habitrpg.controller("FiltersCtrl", ['$scope', '$rootScope', 'User', ui.item.sortable.cancel(); }, stop: function(e, ui) { - User.user.ops.sortTag({ - query: {from: ui.item.sortable.index, to:ui.item.sortable.dropindex} - }); + var from = ui.item.sortable.index, to = ui.item.sortable.dropindex; + if (!from || !to) return; + User.user.ops.sortTag({query: {from: from, to: to}}); }, axis: 'x', //distance: 5 diff --git a/public/js/controllers/tasksCtrl.js b/public/js/controllers/tasksCtrl.js index 24a5daee66..640f3da797 100644 --- a/public/js/controllers/tasksCtrl.js +++ b/public/js/controllers/tasksCtrl.js @@ -90,10 +90,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N ui.item.sortable.cancel(); }, stop: function(e, ui) { - User.user.ops.sortTask({ - params: {id: ui.item.scope().task.id}, - query: {from: ui.item.sortable.index, to:ui.item.sortable.dropindex} - }); + var from = ui.item.sortable.index, to = ui.item.sortable.dropindex; + if (!from || !to) return; + User.user.ops.sortTask({ params: {id: ui.item.scope().task.id}, query: {from: from, to: to} }); }, axis: 'y', //distance: 5