diff options
| author | Alexander Schmitz <arschmitz@gmail.com> | 2015-01-01 12:11:06 -0500 |
|---|---|---|
| committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-03-11 16:04:34 -0400 |
| commit | f58277a521ae41b1d3e054a419ef5fda85e7db21 (patch) | |
| tree | 838593ff770211c94c8fe24cf3a3baa019426a65 /tests/unit | |
| parent | e9bb449b5dde255e4a79ea6768864ba26529ed6c (diff) | |
| download | jquery-ui-f58277a521ae41b1d3e054a419ef5fda85e7db21.tar.gz jquery-ui-f58277a521ae41b1d3e054a419ef5fda85e7db21.zip | |
Droppable: Add classes option
Ref #7053
Ref gh-1411
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/droppable/droppable.html | 3 | ||||
| -rw-r--r-- | tests/unit/droppable/droppable_common.js | 2 | ||||
| -rw-r--r-- | tests/unit/droppable/droppable_common_deprecated.js | 21 | ||||
| -rw-r--r-- | tests/unit/droppable/droppable_deprecated.html | 47 |
4 files changed, 71 insertions, 2 deletions
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index 03ff888e8..52dc3d543 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -5,6 +5,9 @@ <title>jQuery UI Droppable Test Suite</title> <script src="../../jquery.js"></script> + <script> + $.uiBackCompat = false; + </script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> <script src="../../../external/qunit/qunit.js"></script> <script src="../../../external/jquery-simulate/jquery.simulate.js"></script> diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js index bd56aa35f..87d3ca1db 100644 --- a/tests/unit/droppable/droppable_common.js +++ b/tests/unit/droppable/droppable_common.js @@ -1,12 +1,10 @@ TestHelpers.commonWidgetTests( "droppable", { defaults: { accept: "*", - activeClass: false, addClasses: true, classes: {}, disabled: false, greedy: false, - hoverClass: false, scope: "default", tolerance: "intersect", diff --git a/tests/unit/droppable/droppable_common_deprecated.js b/tests/unit/droppable/droppable_common_deprecated.js new file mode 100644 index 000000000..bd56aa35f --- /dev/null +++ b/tests/unit/droppable/droppable_common_deprecated.js @@ -0,0 +1,21 @@ +TestHelpers.commonWidgetTests( "droppable", { + defaults: { + accept: "*", + activeClass: false, + addClasses: true, + classes: {}, + disabled: false, + greedy: false, + hoverClass: false, + scope: "default", + tolerance: "intersect", + + // callbacks + activate: null, + create: null, + deactivate: null, + drop: null, + out: null, + over: null + } +}); diff --git a/tests/unit/droppable/droppable_deprecated.html b/tests/unit/droppable/droppable_deprecated.html new file mode 100644 index 000000000..5af53a2f7 --- /dev/null +++ b/tests/unit/droppable/droppable_deprecated.html @@ -0,0 +1,47 @@ +<!doctype html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title>jQuery UI Droppable Test Suite</title> + + <script src="../../jquery.js"></script> + <link rel="stylesheet" href="../../../external/qunit/qunit.css"> + <script src="../../../external/qunit/qunit.js"></script> + <script src="../../../external/jquery-simulate/jquery.simulate.js"></script> + <script src="../testsuite.js"></script> + <script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script> + <script> + TestHelpers.loadResources({ + css: [ "core" ], + js: [ + "ui/core.js", + "ui/widget.js", + "ui/mouse.js", + "ui/draggable.js", + "ui/droppable.js" + ] + }); + </script> + + <script src="droppable_common_deprecated.js"></script> + <script src="droppable_core.js"></script> + <script src="droppable_events.js"></script> + <script src="droppable_methods.js"></script> + <script src="droppable_options.js"></script> + <script src="droppable_test_helpers.js"></script> + + <script src="../swarminject.js"></script> +</head> +<body> + +<div id="qunit"></div> +<div id="qunit-fixture"> + +<div id="draggable1" style="width: 25px; height: 25px;">Draggable</div> +<div id="droppable1" style="width: 100px; height: 100px;">Droppable</div> +<div id="droppable2" style="width: 100px; height: 100px;">Droppable</div> +<div style='width:1000px;height:1000px;'> </div> + +</div> +</body> +</html> |