Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2259 from kzantow/JENKINS-34137-smarter-setup-wiz…
…ard-close

[JENKINS-34137] setup wizard: better handling of the close button
  • Loading branch information
daniel-beck committed Apr 22, 2016
2 parents 20d3d8a + 1c39655 commit 5d90f81
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions war/src/main/js/pluginSetupWizardGui.js
Expand Up @@ -207,7 +207,7 @@ var createPluginSetupWizard = function(appendTarget) {
decorate($container);

var $modalHeader = $container.find('.modal-header');
if($modalHeader.length > 0) {
if($modalHeader.length > 0 && $modalHeader.is('.closeable')) {
$modalHeader.prepend(
'<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
}
Expand Down Expand Up @@ -815,7 +815,7 @@ var createPluginSetupWizard = function(appendTarget) {
'.plugin-select-recommended': function() { selectedPluginNames = pluginManager.recommendedPluginNames(); refreshPluginSelectionPanel(); },
'.plugin-show-selected': toggleSelectedSearch,
'.select-category': selectCategory,
'.close': closeInstaller,
'.close': skipFirstUser,
'.resume-installation': resumeInstallation,
'.install-done-restart': restartJenkins,
'.save-first-user:not([disabled])': saveFirstUser,
Expand Down
2 changes: 1 addition & 1 deletion war/src/main/js/templates/pluginSelectionPanel.hbs
@@ -1,4 +1,4 @@
<div class="modal-header">
<div class="modal-header closeable">
<h4 class="modal-title">{{translations.installWizard_installCustom_title}}</h4>
</div>
<div class="modal-body plugin-selector">
Expand Down
2 changes: 1 addition & 1 deletion war/src/main/js/templates/welcomePanel.hbs
@@ -1,4 +1,4 @@
<div class="modal-header">
<div class="modal-header closeable">
<h4 class="modal-title">{{translations.installWizard_welcomePanel_title}}</h4>
</div>
<div class="modal-body">
Expand Down

0 comments on commit 5d90f81

Please sign in to comment.