library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dialog: Cleanup in ticket tests: TODO to merge one test, fix whitespace

Browse Source
This commit is contained in:
Jörn Zaefferer 2012-11-16 19:46:01 +01:00
parent b694409e76
commit 299681e8f0
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tests/unit/dialog/dialog_tickets.js
View File

@ -71,24 +71,24 @@ test("#5184: isOpen in dialogclose event is true", function() {
}); });
test("#5531: dialog width should be at least minWidth on creation", function () { test("#5531: dialog width should be at least minWidth on creation", function () {
expect( 4 ); expect( 4 );
var el = $('<div></div>').dialog({ var el = $('<div></div>').dialog({
width: 200, width: 200,
minWidth: 300 minWidth: 300
}); });
equal(el.dialog('option', 'width'), 300, "width is minWidth"); equal(el.dialog('option', 'width'), 300, "width is minWidth");
el.dialog('option', 'width', 200); el.dialog('option', 'width', 200);
equal(el.dialog('option', 'width'), 300, "width unchanged when set to < minWidth"); equal(el.dialog('option', 'width'), 300, "width unchanged when set to < minWidth");
el.dialog('option', 'width', 320); el.dialog('option', 'width', 320);
equal(el.dialog('option', 'width'), 320, "width changed if set to > minWidth"); equal(el.dialog('option', 'width'), 320, "width changed if set to > minWidth");
el.remove(); el.remove();
el = $('<div></div>').dialog({ el = $('<div></div>').dialog({
minWidth: 300 minWidth: 300
}); });
ok(el.dialog('option', 'width') >= 300, "width is at least 300"); ok(el.dialog('option', 'width') >= 300, "width is at least 300");
el.remove(); el.remove();
}); });
@ -108,20 +108,21 @@ test("#6137: dialog('open') causes form elements to reset on IE7", function() {
}); });
test("#6645: Missing element not found check in overlay", function(){ test("#6645: Missing element not found check in overlay", function(){
expect(2); expect(2);
var d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true}), var d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true}),
d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }}); d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
equal($.ui.dialog.overlay.instances.length, 2, 'two overlays created'); equal($.ui.dialog.overlay.instances.length, 2, 'two overlays created');
d2.dialog('close'); d2.dialog('close');
equal($.ui.dialog.overlay.instances.length, 1, 'one overlay remains after closing the 2nd overlay'); equal($.ui.dialog.overlay.instances.length, 1, 'one overlay remains after closing the 2nd overlay');
d1.add(d2).remove(); d1.add(d2).remove();
}); });
// TODO merge this with the main destroy test
test("#4980: Destroy should place element back in original DOM position", function(){ test("#4980: Destroy should place element back in original DOM position", function(){
expect( 2 ); expect( 2 );
var container = $('<div id="container"><div id="modal">Content</div></div>'), var container = $('<div id="container"><div id="modal">Content</div></div>'),
modal = container.find('#modal'); modal = container.find('#modal');
modal.dialog(); modal.dialog();
ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element'); ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element');
modal.dialog('destroy'); modal.dialog('destroy');