aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-11-26 16:27:18 -0500
committerScott González <scott.gonzalez@gmail.com>2012-11-26 16:27:18 -0500
commitee8d20ea067f29c90a0c46ddb91584989d585b28 (patch)
treebe6122abc71d9272fa1db0b4fc61cfdadb688887 /tests
parentf0c203a9a0cc7cbb70738436ed99c38b407e772a (diff)
downloadjquery-ui-ee8d20ea067f29c90a0c46ddb91584989d585b28.tar.gz
jquery-ui-ee8d20ea067f29c90a0c46ddb91584989d585b28.zip
Dialog: Moved resizable handle test from resizable.
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/dialog/dialog_core.js13
-rw-r--r--tests/unit/resizable/resizable.html2
-rw-r--r--tests/unit/resizable/resizable_options.js14
3 files changed, 13 insertions, 16 deletions
diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js
index 404e81770..9c0e80825 100644
--- a/tests/unit/dialog/dialog_core.js
+++ b/tests/unit/dialog/dialog_core.js
@@ -80,4 +80,17 @@ test( "focus tabbable", function() {
}, 13);
});
+// #7960
+test( "resizable handles below modal overlays", function() {
+ expect( 1 );
+
+ var resizable = $( "<div>" ).resizable(),
+ dialog = $( "<div>" ).dialog({ modal: true }),
+ resizableZindex = parseInt( resizable.find( ".ui-resizable-handle" ).css( "zIndex" ), 10 ),
+ overlayZindex = parseInt( $( ".ui-widget-overlay" ).css( "zIndex" ), 10 );
+
+ ok( resizableZindex < overlayZindex, "Resizable handles have lower z-index than modal overlay" );
+ dialog.dialog( "destroy" );
+});
+
})(jQuery);
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 7a63de0bc..0a27f2a80 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -16,8 +16,6 @@
"ui/jquery.ui.core.js",
"ui/jquery.ui.widget.js",
"ui/jquery.ui.mouse.js",
- "ui/jquery.ui.button.js",
- "ui/jquery.ui.dialog.js",
"ui/jquery.ui.resizable.js"
]
});
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index c8627953b..4b47762ab 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -210,18 +210,4 @@ test("zIndex, applied to all handles", function() {
});
});
-test( "zIndex, less than a modal dialog's overlay by default", function() {
- expect(1);
-
- var resizable = $( '<div></div>' ).resizable();
- var dialog = $( '<div></div>' ).dialog( { modal: true });
-
- var resizableZIndex = resizable.resizable( 'option', 'zIndex' );
- var overlayZIndex = $( '.ui-widget-overlay' ).css( 'zIndex' );
- overlayZIndex = parseInt( overlayZIndex, 10 );
-
- ok( resizableZIndex < overlayZIndex, "Resizables behind a modal dialog must have a smaller z-index than the overlay so that they're not resizable. See #7960." );
- dialog.dialog( 'destroy' );
-});
-
})(jQuery);