Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resizable: Modified the default z-index value of resizable handles. F…
…ixed #7960 - Dialog: Modal dialogs do not disable resizables on the page.
  • Loading branch information
tjvantoll authored and jzaefferer committed Nov 26, 2012
1 parent a68d5ca commit 0cd470b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 2 additions & 0 deletions tests/unit/resizable/resizable.html
Expand Up @@ -16,6 +16,8 @@
"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"
]
});
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/resizable/resizable_common.js
Expand Up @@ -19,7 +19,7 @@ TestHelpers.commonWidgetTests('resizable', {
maxWidth: null,
minHeight: 10,
minWidth: 10,
zIndex: 1000,
zIndex: 90,

// callbacks
create: null
Expand Down
14 changes: 14 additions & 0 deletions tests/unit/resizable/resizable_options.js
Expand Up @@ -210,4 +210,18 @@ 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);
3 changes: 2 additions & 1 deletion ui/jquery.ui.resizable.js
Expand Up @@ -42,7 +42,8 @@ $.widget("ui.resizable", $.ui.mouse, {
maxWidth: null,
minHeight: 10,
minWidth: 10,
zIndex: 1000
// See #7960
zIndex: 90
},
_create: function() {

Expand Down

0 comments on commit 0cd470b

Please sign in to comment.