aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Worth <rdworth@gmail.com>2008-06-26 10:23:38 +0000
committerRichard Worth <rdworth@gmail.com>2008-06-26 10:23:38 +0000
commite42b0f6b8bf910885b7b84037b312c5c93b47a26 (patch)
tree1d17fb6f31fafed8c59609a791e9ec8d8097a06e
parent505d88ec285824b6ba0a27b597e5cd1094c67b40 (diff)
downloadjquery-ui-e42b0f6b8bf910885b7b84037b312c5c93b47a26.tar.gz
jquery-ui-e42b0f6b8bf910885b7b84037b312c5c93b47a26.zip
resizable, selectable, sortable: changed cancel default to ':input' instead of (redundant) ':input,button'
-rw-r--r--tests/sortable.js2
-rw-r--r--ui/ui.resizable.js2
-rw-r--r--ui/ui.selectable.js2
-rw-r--r--ui/ui.sortable.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/sortable.js b/tests/sortable.js
index a3000ff24..f3f88a887 100644
--- a/tests/sortable.js
+++ b/tests/sortable.js
@@ -117,7 +117,7 @@ test("defaults", function() {
equals(el.data("scroll.sortable"), true, "scroll");
equals(el.data("scrollSensitivity.sortable"), 20, "scrollSensitivity");
equals(el.data("scrollSpeed.sortable"), 20, "scrollSpeed");
- equals(el.data("cancel.sortable"), ":input,button", "cancel");
+ equals(el.data("cancel.sortable"), ":input", "cancel");
equals(el.data("items.sortable"), "> *", "items");
equals(el.data("zIndex.sortable"), 1000, "zIndex");
equals(el.data("dropOnEmpty.sortable"), true, "dropOnEmpty");
diff --git a/ui/ui.resizable.js b/ui/ui.resizable.js
index 5192129b4..55a279b8f 100644
--- a/ui/ui.resizable.js
+++ b/ui/ui.resizable.js
@@ -503,7 +503,7 @@ $.widget("ui.resizable", $.extend($.ui.mouse, {
$.extend($.ui.resizable, {
defaults: {
- cancel: ":input,button",
+ cancel: ":input",
distance: 1,
delay: 0,
preventDefault: true,
diff --git a/ui/ui.selectable.js b/ui/ui.selectable.js
index 57ea405a8..db69a488a 100644
--- a/ui/ui.selectable.js
+++ b/ui/ui.selectable.js
@@ -253,7 +253,7 @@ $.extend($.ui.selectable, {
defaults: {
distance: 1,
delay: 0,
- cancel: ":input,button",
+ cancel: ":input",
appendTo: 'body',
autoRefresh: true,
filter: '*',
diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js
index 0120a9b30..d172a51dd 100644
--- a/ui/ui.sortable.js
+++ b/ui/ui.sortable.js
@@ -624,7 +624,7 @@ $.extend($.ui.sortable, {
scroll: true,
scrollSensitivity: 20,
scrollSpeed: 20,
- cancel: ":input,button",
+ cancel: ":input",
items: '> *',
zIndex: 1000,
dropOnEmpty: true,