diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-07 15:37:02 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-01-07 15:37:02 +0000 |
| commit | e62531a6276ea60a51ac9f4590aab3aeacd8df61 (patch) | |
| tree | 013f885b92012da0dbb9fbfa9d538ff3f298fa42 | |
| parent | c424efe6ff4919e7aeb82d2dccc8288f41ea9d70 (diff) | |
| download | jquery-ui-e62531a6276ea60a51ac9f4590aab3aeacd8df61.tar.gz jquery-ui-e62531a6276ea60a51ac9f4590aab3aeacd8df61.zip | |
cancel option should take in account <option> (fixes #3786)
| -rw-r--r-- | ui/ui.draggable.js | 2 | ||||
| -rw-r--r-- | ui/ui.resizable.js | 2 | ||||
| -rw-r--r-- | ui/ui.selectable.js | 2 | ||||
| -rw-r--r-- | ui/ui.sortable.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js index 6959af38c..cac4941ca 100644 --- 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 61cea5206..c557444cd 100644 --- 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 f63632c1d..d8f86a406 100644 --- 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 1ee7c5936..39f1a8b34 100644 --- 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, |