aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-05-21 14:49:49 -0400
committerScott González <scott.gonzalez@gmail.com>2012-05-21 14:49:49 -0400
commit51863d5a71f50c86b1757a1a0840d7571f6a0ef7 (patch)
treea1208f3bb9340e8e571edeb4edd0e7aad7bc668c /tests/unit
parentb4ca9289cf018c744ec57e8356783a76ff3691e0 (diff)
downloadjquery-ui-51863d5a71f50c86b1757a1a0840d7571f6a0ef7.tar.gz
jquery-ui-51863d5a71f50c86b1757a1a0840d7571f6a0ef7.zip
Don't use :input selector.
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/draggable/draggable_common.js2
-rw-r--r--tests/unit/draggable/draggable_options.js8
-rw-r--r--tests/unit/resizable/resizable_common.js2
-rw-r--r--tests/unit/selectable/selectable_common.js2
-rw-r--r--tests/unit/slider/slider_common.js2
-rw-r--r--tests/unit/sortable/sortable_common.js2
-rw-r--r--tests/unit/sortable/sortable_options.js2
7 files changed, 10 insertions, 10 deletions
diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
index b47b139cd..64f8ce4a3 100644
--- a/tests/unit/draggable/draggable_common.js
+++ b/tests/unit/draggable/draggable_common.js
@@ -3,7 +3,7 @@ TestHelpers.commonWidgetTests( "draggable", {
addClasses: true,
appendTo: "parent",
axis: false,
- cancel: ":input,option",
+ cancel: "input,textarea,button,select,option",
connectToSortable: false,
containment: false,
cursor: "auto",
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index 464e025dd..ea4611d69 100644
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -106,15 +106,15 @@ test("{ axis: ? }, unexpected", function() {
});
});
-test("{ cancel: ':input,option' }, default", function() {
+test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
$('<div id="draggable-option-cancel-default"><input type="text"></div>').appendTo('#main');
- el = $("#draggable-option-cancel-default").draggable({ cancel: ":input,option" });
+ el = $("#draggable-option-cancel-default").draggable({ cancel: "input,textarea,button,select,option" });
drag("#draggable-option-cancel-default", 50, 50);
moved(50, 50);
- el = $("#draggable-option-cancel-default").draggable({ cancel: ":input,option" });
- drag("#draggable-option-cancel-default :input", 50, 50);
+ el = $("#draggable-option-cancel-default").draggable({ cancel: "input,textarea,button,select,option" });
+ drag("#draggable-option-cancel-default input", 50, 50);
moved(0, 0);
el.draggable("destroy");
diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js
index 617cdd2ad..119f5bd0e 100644
--- a/tests/unit/resizable/resizable_common.js
+++ b/tests/unit/resizable/resizable_common.js
@@ -6,7 +6,7 @@ TestHelpers.commonWidgetTests('resizable', {
animateEasing: 'swing',
aspectRatio: false,
autoHide: false,
- cancel: ':input,option',
+ cancel: 'input,textarea,button,select,option',
containment: false,
delay: 0,
disabled: false,
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
index 27714d0ae..885e79401 100644
--- a/tests/unit/selectable/selectable_common.js
+++ b/tests/unit/selectable/selectable_common.js
@@ -2,7 +2,7 @@ TestHelpers.commonWidgetTests('selectable', {
defaults: {
appendTo: 'body',
autoRefresh: true,
- cancel: ':input,option',
+ cancel: 'input,textarea,button,select,option',
delay: 0,
disabled: false,
distance: 0,
diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js
index 8a0b347f3..ccf793549 100644
--- a/tests/unit/slider/slider_common.js
+++ b/tests/unit/slider/slider_common.js
@@ -1,7 +1,7 @@
TestHelpers.commonWidgetTests( "slider", {
defaults: {
animate: false,
- cancel: ':input,option',
+ cancel: 'input,textarea,button,select,option',
delay: 0,
disabled: false,
distance: 0,
diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js
index b5fc05a5d..ae21f7dd2 100644
--- a/tests/unit/sortable/sortable_common.js
+++ b/tests/unit/sortable/sortable_common.js
@@ -2,7 +2,7 @@ TestHelpers.commonWidgetTests( "sortable", {
defaults: {
appendTo: "parent",
axis: false,
- cancel: ":input,option",
+ cancel: "input,textarea,button,select,option",
connectWith: false,
containment: false,
cursor: "auto",
diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js
index 507d5dcfa..a043e68fe 100644
--- a/tests/unit/sortable/sortable_options.js
+++ b/tests/unit/sortable/sortable_options.js
@@ -29,7 +29,7 @@ test("{ axis: ? }, unexpected", function() {
ok(false, "missing test - untested code is broken code.");
});
-test("{ cancel: ':input,button' }, default", function() {
+test("{ cancel: 'input,textarea,button,select,option' }, default", function() {
ok(false, "missing test - untested code is broken code.");
});