From 5c1a099923a1ddb8b34a69c3f81cdffc4c5b29da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6berle?= Date: Wed, 3 Sep 2014 10:38:43 +0200 Subject: [PATCH 1/3] Don't overwrite the initial cancel settings --- src/jquery.multisortable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jquery.multisortable.js b/src/jquery.multisortable.js index e43afaf..8deb7aa 100644 --- a/src/jquery.multisortable.js +++ b/src/jquery.multisortable.js @@ -164,7 +164,7 @@ }); //enable sorting - options.cancel = settings.items + ':not(.' + settings.selectedClass + ')'; + options.cancel = (options.cancel || '') + ' ' + settings.items + ':not(.' + settings.selectedClass + ')'; options.placeholder = settings.placeholder; options.start = function(event, ui) { if (ui.item.hasClass(settings.selectedClass)) { @@ -251,4 +251,4 @@ items: 'li' }; -}(jQuery); \ No newline at end of file +}(jQuery); From 9d59c34ab166e331d75c89f7ba9d2f68a9fbf75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6berle?= Date: Thu, 4 Sep 2014 09:38:06 +0200 Subject: [PATCH 2/3] Update jquery.multisortable.js --- src/jquery.multisortable.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/jquery.multisortable.js b/src/jquery.multisortable.js index 8deb7aa..1b0eba1 100644 --- a/src/jquery.multisortable.js +++ b/src/jquery.multisortable.js @@ -164,6 +164,9 @@ }); //enable sorting + if (option.cancel) { + option.cancel += ', '; + } options.cancel = (options.cancel || '') + ' ' + settings.items + ':not(.' + settings.selectedClass + ')'; options.placeholder = settings.placeholder; options.start = function(event, ui) { From 5c88ad81d18158ef35d4609f660c42e396304ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6berle?= Date: Thu, 4 Sep 2014 09:38:59 +0200 Subject: [PATCH 3/3] Update jquery.multisortable.js --- src/jquery.multisortable.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jquery.multisortable.js b/src/jquery.multisortable.js index 1b0eba1..6111238 100644 --- a/src/jquery.multisortable.js +++ b/src/jquery.multisortable.js @@ -164,8 +164,8 @@ }); //enable sorting - if (option.cancel) { - option.cancel += ', '; + if (options.cancel) { + options.cancel += ', '; } options.cancel = (options.cancel || '') + ' ' + settings.items + ':not(.' + settings.selectedClass + ')'; options.placeholder = settings.placeholder;