aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/dialog
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-03-19 19:59:31 +0100
committerFelix Nagel <info@felixnagel.com>2013-03-19 19:59:31 +0100
commit1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2 (patch)
tree77edf8d66ab74aa11b86c286ba2a528b4d3c36de /tests/unit/dialog
parent5a9a80f86cc7844e7357af834c61cc14431110d1 (diff)
parent1c1f7c6184ba6f6a13e93960ea77c293f9d4308e (diff)
downloadjquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.tar.gz
jquery-ui-1ce8d87f8bee3b1ec8698e0e2b8ead726d0d4ca2.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/unit/dialog')
-rw-r--r--tests/unit/dialog/dialog_deprecated.html67
-rw-r--r--tests/unit/dialog/dialog_deprecated.js63
-rw-r--r--tests/unit/dialog/dialog_events.js4
-rw-r--r--tests/unit/dialog/dialog_methods.js4
4 files changed, 5 insertions, 133 deletions
diff --git a/tests/unit/dialog/dialog_deprecated.html b/tests/unit/dialog/dialog_deprecated.html
deleted file mode 100644
index 1f8bac689..000000000
--- a/tests/unit/dialog/dialog_deprecated.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
- <meta charset="utf-8">
- <title>jQuery UI Dialog Test Suite</title>
-
- <script src="../../jquery.js"></script>
- <link rel="stylesheet" href="../../../external/qunit.css">
- <script src="../../../external/qunit.js"></script>
- <script src="../../jquery.simulate.js"></script>
- <script src="../testsuite.js"></script>
- <script>
- TestHelpers.loadResources({
- css: [ "ui.core", "ui.dialog" ],
- js: [
- "ui/jquery.ui.core.js",
- "ui/jquery.ui.widget.js",
- "ui/jquery.ui.position.js",
- "ui/jquery.ui.mouse.js",
- "ui/jquery.ui.draggable.js",
- "ui/jquery.ui.resizable.js",
- "ui/jquery.ui.button.js",
- "ui/jquery.ui.effect.js",
- "ui/jquery.ui.effect-blind.js",
- "ui/jquery.ui.effect-clip.js",
- "ui/jquery.ui.effect-explode.js",
- "ui/jquery.ui.dialog.js"
- ]
- });
- </script>
-
- <script src="dialog_common.js"></script>
- <script src="dialog_core.js"></script>
- <script src="dialog_events.js"></script>
- <script src="dialog_methods.js"></script>
- <script src="dialog_options.js"></script>
- <script src="dialog_test_helpers.js"></script>
- <script src="dialog_deprecated.js"></script>
-
- <script src="../swarminject.js"></script>
-</head>
-<body>
-
-<h1 id="qunit-header">jQuery UI Dialog Test Suite</h1>
-<h2 id="qunit-banner"></h2>
-<div id="qunit-testrunner-toolbar"></div>
-<h2 id="qunit-userAgent"></h2>
-<ol id="qunit-tests"></ol>
-<div id="qunit-fixture">
- <div id="dialog1"></div>
- <div id="dialog2"></div>
- <div id="form-dialog" title="Profile Information">
- <fieldset>
- <legend>Please share some personal information</legend>
- <label for="favorite-animal">Your favorite animal</label><input id="favorite-animal">
- <label for="favorite-color">Your favorite color</label><input id="favorite-color">
- </fieldset>
- <div role="group" aria-describedby="section2">
- <p id="section2">Some more (optional) information</p>
- <label for="favorite-food">Favorite food</label><input id="favorite-food">
- </div>
- </div>
- <div class="wrap" id="wrap1"></div>
- <div class="wrap" id="wrap2"></div>
-</div>
-</body>
-</html>
diff --git a/tests/unit/dialog/dialog_deprecated.js b/tests/unit/dialog/dialog_deprecated.js
deleted file mode 100644
index ff6284ea5..000000000
--- a/tests/unit/dialog/dialog_deprecated.js
+++ /dev/null
@@ -1,63 +0,0 @@
-module("dialog (deprecated): position option with string and array");
-
-test( "position, right bottom on window w/array", function() {
- expect( 2 );
-
- // dialogs alter the window width and height in FF and IE7
- // so we collect that information before creating the dialog
- // Support: FF, IE7
- var winWidth = $( window ).width(),
- winHeight = $( window ).height(),
- element = $("<div></div>").dialog({ position: [ "right", "bottom" ] }),
- dialog = element.dialog("widget"),
- offset = dialog.offset();
- closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window w/array" );
- closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window w/array" );
- element.remove();
-});
-
-test( "position, right bottom on window", function() {
- expect( 2 );
-
- // dialogs alter the window width and height in FF and IE7
- // so we collect that information before creating the dialog
- // Support: FF, IE7
- var winWidth = $( window ).width(),
- winHeight = $( window ).height(),
- element = $("<div></div>").dialog({ position: "right bottom" }),
- dialog = element.dialog("widget"),
- offset = dialog.offset();
- closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window" );
- closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window" );
- element.remove();
-});
-
-test("position, offset from top left w/array", function() {
- expect( 2 );
- var element = $("<div></div>").dialog({ position: [10, 10] }),
- dialog = element.dialog("widget"),
- offset = dialog.offset();
- closeEnough(offset.left, 10 + $(window).scrollLeft(), 1);
- closeEnough(offset.top, 10 + $(window).scrollTop(), 1);
- element.remove();
-});
-
-test("position, top on window", function() {
- expect( 2 );
- var element = $("<div></div>").dialog({ position: "top" }),
- dialog = element.dialog("widget"),
- offset = dialog.offset();
- closeEnough(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft(), 1);
- closeEnough(offset.top, $(window).scrollTop(), 1);
- element.remove();
-});
-
-test("position, left on window", function() {
- expect( 2 );
- var element = $("<div></div>").dialog({ position: "left" }),
- dialog = element.dialog("widget"),
- offset = dialog.offset();
- closeEnough(offset.left, 0, 1);
- closeEnough(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop(), 1);
- element.remove();
-});
diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js
index 7bcd5673e..1384500f6 100644
--- a/tests/unit/dialog/dialog_events.js
+++ b/tests/unit/dialog/dialog_events.js
@@ -11,7 +11,7 @@ test("open", function() {
var element = $("<div></div>");
element.dialog({
open: function(ev, ui) {
- ok(element.data("ui-dialog")._isOpen, "interal _isOpen flag is set");
+ ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
ok(true, "autoOpen: true fires open callback");
equal(this, element[0], "context of callback");
equal(ev.type, "dialogopen", "event type in callback");
@@ -30,7 +30,7 @@ test("open", function() {
deepEqual(ui, {}, "ui hash in callback");
}
}).bind("dialogopen", function(ev, ui) {
- ok(element.data("ui-dialog")._isOpen, "interal _isOpen flag is set");
+ ok(element.dialog( "instance" )._isOpen, "interal _isOpen flag is set");
ok(true, "dialog('open') fires open event");
equal(this, element[0], "context of event");
deepEqual(ui, {}, "ui hash in event");
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
index 6de185513..2bb06ab46 100644
--- a/tests/unit/dialog/dialog_methods.js
+++ b/tests/unit/dialog/dialog_methods.js
@@ -101,11 +101,13 @@ test("#4980: Destroy should place element back in original DOM position", functi
});
test( "enable/disable disabled", function() {
- expect( 2 );
+ expect( 4 );
var element = $( "<div></div>" ).dialog();
element.dialog( "disable" );
equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
ok( !element.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
+ ok( !element.dialog( "widget" ).hasClass( "ui-state-disabled" ), "disable method doesn't add ui-state-disabled class" );
+ ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
});
test("close", function() {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 09:21:06 +0000