Skip to content

Checkboxradio: icons inside dialogs #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Checkboxradio: icons inside dialogs #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35dd7a2
Checkboxradio: icons broken inside dialogs
ChaseWagoner May 25, 2016
e4f9794
Checkboxradio: fix visual test JS errors
ChaseWagoner May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions tests/visual/checkboxradio/checkboxradio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
<meta charset="utf-8">
<title>jQuery UI - Checkboxes</title>
<link rel="stylesheet" href="../../../themes/base/all.css">
<script src="../../../external/jquery/jquery.js"></script>
<script src="../../../ui/core.js"></script>
<script src="../../../ui/widget.js"></script>
<script src="../../../ui/button.js"></script>
<script src="../../../ui/checkboxradio.js"></script>
<script>
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../demos/bootstrap.js" data-modules="widget button">
$(function() {
var checkboxes = $( "form input" ).checkboxradio();

Expand Down
26 changes: 26 additions & 0 deletions tests/visual/checkboxradio/inside-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Checkbox Inside Dialog</title>
<link rel="stylesheet" href="../../../themes/base/all.css">
<script src="../../../external/requirejs/require.js"></script>
<script src="../../../demos/bootstrap.js" data-modules="dialog">
$(function() {
$( "#checkbox" ).checkboxradio();
$( "#dialog" ).dialog();
});
</script>
</head>
<body>

<p>WHAT: A modal dialog containing a checkbox.</p>
<p>EXPECTED: Checkbox icon is correct when checked.</p>

<div id="dialog" title="Dialog containing checkbox">
<input type="checkbox" id="checkbox" />
<label for="checkbox">Click me</label>
</div>

</body>
</html>
1 change: 1 addition & 0 deletions tests/visual/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ <h2>Button</h2>
<h2>Checkboxradio</h2>
<ul>
<li><a href="checkboxradio/checkboxradio.html">General</a></li>
<li><a href="checkboxradio/inside-dialog.html">Inside dialog</a></li>
</ul>

<h2>Dialog</h2>
Expand Down
2 changes: 1 addition & 1 deletion themes/base/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ a.ui-button:active,
.ui-widget-content .ui-state-highlight,
.ui-widget-header .ui-state-highlight {
border: 1px solid #dad55e/*{borderColorHighlight}*/;
background: #fffa90/*{bgColorHighlight}*/ /*{bgImgUrlHighlight}*/ /*{bgHighlightXPos}*/ /*{bgHighlightYPos}*/ /*{bgHighlightRepeat}*/;
background-color: #fffa90/*{bgColorHighlight}*/ /*{bgImgUrlHighlight}*/ /*{bgHighlightXPos}*/ /*{bgHighlightYPos}*/ /*{bgHighlightRepeat}*/;
Copy link
Author

@ChaseWagoner ChaseWagoner May 25, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the comments for unspecified properties be removed? i.e. this line would read

    background-color: #fffa90/*{bgColorHighlight}*/;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will break ThemeRoller.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scottgonzalez how can I test that? Is there a way to make ThemeRoller produce individual properties, rather than consolidated?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scottgonzalez how can I test that?

Testing it is a bit tricky. It would require setting up https://github.com/jquery/download.jqueryui.com/ locally and then using your updated theme in ThemeRoller.

Is there a way to make ThemeRoller produce individual properties, rather than consolidated?

You'd have to list all the properties. ThemeRoller just does token replacement. But won't producing individual properties cause the same problem?

color: #777620/*{fcHighlight}*/;
}
.ui-state-highlight a,
Expand Down