r1537 - trunk/ui
r1537 - trunk/ui
Author: paul.bakaus
Date: Wed Jan 7 07:37:02 2009
New Revision: 1537
Modified:
trunk/ui/ui.draggable.js
trunk/ui/ui.resizable.js
trunk/ui/ui.selectable.js
trunk/ui/ui.sortable.js
Log:
cancel option should take in account <option> (fixes #3786)
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js (original)
+++ trunk/ui/ui.draggable.js Wed Jan 7 07:37:02 2009
@@ -363,7 +363,7 @@
defaults: {
appendTo: "parent",
axis: false,
- cancel: ":input",
+ cancel: ":input,option",
connectToSortable: false,
containment: false,
cssNamespace: "ui",
Modified: trunk/ui/ui.resizable.js
==============================================================================
--- trunk/ui/ui.resizable.js (original)
+++ trunk/ui/ui.resizable.js Wed Jan 7 07:37:02 2009
@@ -547,7 +547,7 @@
animateEasing: "swing",
aspectRatio: false,
autoHide: false,
- cancel: ":input",
+ cancel: ":input,option",
containment: false,
delay: 0,
disableSelection: true,
Modified: trunk/ui/ui.selectable.js
==============================================================================
--- trunk/ui/ui.selectable.js (original)
+++ trunk/ui/ui.selectable.js Wed Jan 7 07:37:02 2009
@@ -236,7 +236,7 @@
defaults: {
appendTo: 'body',
autoRefresh: true,
- cancel: ":input",
+ cancel: ":input,option",
delay: 0,
distance: 1,
filter: '*',
Modified: trunk/ui/ui.sortable.js
==============================================================================
--- trunk/ui/ui.sortable.js (original)
+++ trunk/ui/ui.sortable.js Wed Jan 7 07:37:02 2009
@@ -895,7 +895,7 @@
defaults: {
accurateIntersection: true,
appendTo: "parent",
- cancel: ":input",
+ cancel: ":input,option",
delay: 0,
distance: 1,
dropOnEmpty: true,