All: Classes Option #1369
Dialog: use the _classes method.
Deprecate dialogClass. Fixes #7053
- Loading branch information
commit 07f52c131c57992f381704a24ed6a36e0a9cbbb7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| TestHelpers.commonWidgetTests( "dialog", { | ||
| defaults: { | ||
| appendTo: "body", | ||
| autoOpen: true, | ||
| buttons: [], | ||
| classes: { | ||
| "ui-dialog": "ui-corner-all", | ||
| "ui-dialog-content": null, | ||
| "ui-dialog-titlebar": "ui-corner-all", | ||
| "ui-dialog-titlebar-close": null, | ||
| "ui-dialog-title": null, | ||
| "ui-dialog-buttons": null, | ||
| "ui-dialog-buttonpane": null, | ||
| "ui-dialog-buttonset": null, | ||
| "ui-dialog-dragging": null, | ||
| "ui-dialog-resizing": null, | ||
| "ui-widget-overlay": null | ||
| }, | ||
| closeOnEscape: true, | ||
| closeText: "close", | ||
| dialogClass: "", | ||
| disabled: false, | ||
| draggable: true, | ||
| height: "auto", | ||
| hide: null, | ||
| maxHeight: null, | ||
| maxWidth: null, | ||
| minHeight: 150, | ||
| minWidth: 150, | ||
| modal: false, | ||
| position: { | ||
| my: "center", | ||
| at: "center", | ||
| of: window, | ||
| collision: "fit", | ||
| using: $.ui.dialog.prototype.options.position.using | ||
| }, | ||
| resizable: true, | ||
| show: null, | ||
| title: null, | ||
| width: 300, | ||
|
|
||
| // callbacks | ||
| beforeClose: null, | ||
| close: null, | ||
| create: null, | ||
| drag: null, | ||
| dragStart: null, | ||
| dragStop: null, | ||
| focus: null, | ||
| open: null, | ||
| resize: null, | ||
| resizeStart: null, | ||
| resizeStop: null | ||
| } | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>jQuery UI Dialog Test Suite</title> | ||
|
|
||
| <script src="../../jquery.js"></script> | ||
| <script> | ||
| $.uiBackCompat = true; | ||
|
Member
There was a problem hiding this comment. This should be dropped (also for tooltip and where ever else its used). The check in In other words, an undefined May need to do the same update in the button branch. |
||
| </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> | ||
| TestHelpers.loadResources({ | ||
| css: [ "core", "dialog" ], | ||
| js: [ | ||
| "ui/core.js", | ||
| "ui/widget.js", | ||
| "ui/position.js", | ||
| "ui/mouse.js", | ||
| "ui/draggable.js", | ||
| "ui/resizable.js", | ||
| "ui/button.js", | ||
| "ui/effect.js", | ||
| "ui/effect-blind.js", | ||
| "ui/effect-clip.js", | ||
| "ui/effect-explode.js", | ||
| "ui/dialog.js" | ||
| ] | ||
| }); | ||
| </script> | ||
|
|
||
| <script src="dialog_common_derecated.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_deprecated.js"></script> | ||
| <script src="dialog_test_helpers.js"></script> | ||
|
|
||
| <script src="../swarminject.js"></script> | ||
| </head> | ||
| <body> | ||
|
|
||
| <div id="qunit"></div> | ||
| <div id="qunit-fixture"> | ||
| <div id="dialog1"></div> | ||
| <div id="dialog2"></div> | ||
| <div id="form-dialog" title="Profile Information"> | ||
| <!-- create a spacer to ensure there's enough space to scroll --> | ||
| <div style="height: 250px;">...</div> | ||
| <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> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * dialog_deprecated.js | ||
| */ | ||
| (function( $ ) { | ||
|
|
||
| module( "dialog (deprecated): options" ); | ||
|
|
||
| test( "dialogClass", function() { | ||
| expect( 6 ); | ||
|
|
||
| var element = $( "<div></div>" ).dialog(), | ||
| widget = element.dialog( "widget" ); | ||
| equal( widget.is( ".foo" ), false, "dialogClass not specified. class not added" ); | ||
| element.remove(); | ||
|
|
||
| element = $( "<div></div>" ).dialog({ dialogClass: "foo" }); | ||
| widget = element.dialog( "widget" ); | ||
| equal( widget.is( ".foo" ), true, "dialogClass in init. foo class added"); | ||
| element.dialog( "option", "dialogClass", "foobar" ); | ||
| equal( widget.is( ".foo" ), false, "dialogClass changed, previous one was removed" ); | ||
| equal( widget.is( ".foobar" ), true, "dialogClass changed, new one was added" ); | ||
| element.remove(); | ||
|
|
||
| element = $( "<div></div>" ).dialog({ dialogClass: "foo bar" }); | ||
| widget = element.dialog( "widget" ); | ||
| equal( widget.is( ".foo" ), true, "dialogClass in init, two classes. foo class added" ); | ||
| equal( widget.is( ".bar" ), true, "dialogClass in init, two classes. bar class added" ); | ||
| element.remove(); | ||
| }); | ||
|
|
||
| })( jQuery ); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ test("init", function() { | |
| }); | ||
|
|
||
| test("destroy", function() { | ||
| expect( 18 ); | ||
|
|
||
| var element, element2; | ||
|
|
||
|
|
@@ -49,6 +49,14 @@ test("destroy", function() { | |
| equal( dialog.parent()[ 0 ], $( "#qunit-fixture" )[ 0 ] ); | ||
| equal( dialog.index(), 2 ); | ||
| }); | ||
| domEqual( "#dialog2", function() { | ||
| $( "#dialog2" ).dialog({ | ||
| buttons: [{ | ||
| text: "Ok", | ||
| click: $.noop | ||
| }] | ||
| }).dialog( "destroy" ); | ||
| }, "Buttons"); | ||
|
Member
There was a problem hiding this comment. What does this assertion accomplish? Also missing space after the string.
Member
Author
There was a problem hiding this comment. Maybe @petersendidit can answer this i'm not sure and he added it.
Member
There was a problem hiding this comment. At one point I was on a quest to write tests to make sure that all widgets correctly cleaned up after themselves when they were destroyed. There were a few widgets that didn't correctly remove all of their classes. Can't remember if dialog was one of them or not.
Member
There was a problem hiding this comment. Since the other two assertions don't set the buttons option and that adds more markup, keeping this addition is fine. |
||
|
|
||
| // Ensure dimensions are restored (#8119) | ||
| $( "#dialog1" ).show().css({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -224,26 +224,6 @@ test("closeText", function() { | |
| element.remove(); | ||
| }); | ||
|
|
||
| test("draggable", function() { | ||
| expect(4); | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can these be replaced with a single
.attr( "class" )call inside anequal? Also applies to the groups below.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes that would simplify this a lot
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.attr( "class" )is bad since order doesn't matter. But.is( ".a.b.c" )will work fine.