cancel option should take in account <option> (fixes #3786)

diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js
index 6959af38ce7aeffaeef3d797cc4e187143ba4954..cac4941cabf1319dbe5af7eb86ecd857ab4f16c8 100644 (file)
--- a/ui/ui.draggable.js
+++ b/ui/ui.draggable.js
@@ -363,7 +363,7 @@ $.extend($.ui.draggable, {
        defaults: {
                appendTo: "parent",
                axis: false,
-               cancel: ":input",
+               cancel: ":input,option",
                connectToSortable: false,
                containment: false,
                cssNamespace: "ui",

diff --git a/ui/ui.resizable.js b/ui/ui.resizable.js
index 61cea5206120fdc5c97d3d6f3fe8a8f728941540..c557444cd5a6a54e6bd37d80f1df9bd863cc2cb9 100644 (file)
--- a/ui/ui.resizable.js
+++ b/ui/ui.resizable.js
@@ -547,7 +547,7 @@ $.extend($.ui.resizable, {
                animateEasing: "swing",
                aspectRatio: false,
                autoHide: false,
-               cancel: ":input",
+               cancel: ":input,option",
                containment: false,
                delay: 0,
                disableSelection: true,

diff --git a/ui/ui.selectable.js b/ui/ui.selectable.js
index f63632c1d24ce2cbfc4f3124a7e38455c4b068a5..d8f86a40605cfdca8e83399ff14a44410128d65f 100644 (file)
--- a/ui/ui.selectable.js
+++ b/ui/ui.selectable.js
@@ -236,7 +236,7 @@ $.extend($.ui.selectable, {
        defaults: {
                appendTo: 'body',
                autoRefresh: true,
-               cancel: ":input",
+               cancel: ":input,option",
                delay: 0,
                distance: 1,
                filter: '*',

diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js
index 1ee7c59369bff9cd7e109c8cce368e7aa9a7c74f..39f1a8b34a08d789eab80f36ec9dc2a76f5137a6 100644 (file)
--- a/ui/ui.sortable.js
+++ b/ui/ui.sortable.js
@@ -895,7 +895,7 @@ $.extend($.ui.sortable, {
        defaults: {
                accurateIntersection: true,
                appendTo: "parent",
-               cancel: ":input",
+               cancel: ":input,option",
                delay: 0,
                distance: 1,
                dropOnEmpty: true,