Merge pull request #1533 from coreos-inc/pass-dialog-fixes

Fix enter key in password dialogs
This commit is contained in:
josephschorr 2016-06-09 14:48:12 -04:00
commit a8d064055c
3 changed files with 6 additions and 6 deletions

View file

@ -241,14 +241,14 @@ angular.module("core-config-setup", ['angularFileUpload'])
var box = bootbox.dialog({ var box = bootbox.dialog({
"message": 'Please enter your superuser password to validate your auth configuration:' + "message": 'Please enter your superuser password to validate your auth configuration:' +
'<form style="margin-top: 10px" action="javascript:void(0)">' + '<form style="margin-top: 10px" action="javascript:$(\'.btn-continue\').click()">' +
'<input id="validatePassword" class="form-control" type="password" placeholder="Password">' + '<input id="validatePassword" class="form-control" type="password" placeholder="Password">' +
'</form>', '</form>',
"title": 'Enter Password', "title": 'Enter Password',
"buttons": { "buttons": {
"success": { "success": {
"label": "Validate Config", "label": "Validate Config",
"className": "btn-success", "className": "btn-success btn-continue",
"callback": function() { "callback": function() {
$scope.performValidateAndSave($('#validatePassword').val()); $scope.performValidateAndSave($('#validatePassword').val());
} }

View file

@ -168,14 +168,14 @@ angular.module('quay').factory('ApiService', ['Restangular', '$q', 'UtilService'
var box = bootbox.dialog({ var box = bootbox.dialog({
"message": 'It has been more than a few minutes since you last logged in, ' + "message": 'It has been more than a few minutes since you last logged in, ' +
'so please verify your password to perform this sensitive operation:' + 'so please verify your password to perform this sensitive operation:' +
'<form style="margin-top: 10px" action="javascript:void(0)">' + '<form style="margin-top: 10px" action="javascript:$(\'.btn-continue\').click()">' +
'<input id="freshPassword" class="form-control" type="password" placeholder="Current Password">' + '<input id="freshPassword" class="form-control" type="password" placeholder="Current Password">' +
'</form>', '</form>',
"title": 'Please Verify', "title": 'Please Verify',
"buttons": { "buttons": {
"verify": { "verify": {
"label": "Verify", "label": "Verify",
"className": "btn-success", "className": "btn-success btn-continue",
"callback": verifyNow "callback": verifyNow
}, },
"close": { "close": {

View file

@ -199,14 +199,14 @@ angular.module('quay').factory('UIService', ['$timeout', '$rootScope', '$locatio
var box = bootbox.dialog({ var box = bootbox.dialog({
"message": message + "message": message +
'<form style="margin-top: 10px" action="javascript:void(0)">' + '<form style="margin-top: 10px" action="javascript:$(\'.btn-continue\').click()">' +
'<input id="passDialogBox" class="form-control" type="password" placeholder="Current Password">' + '<input id="passDialogBox" class="form-control" type="password" placeholder="Current Password">' +
'</form>', '</form>',
"title": 'Please Verify', "title": 'Please Verify',
"buttons": { "buttons": {
"verify": { "verify": {
"label": "Verify", "label": "Verify",
"className": "btn-success", "className": "btn-success btn-continue",
"callback": success "callback": success
}, },
"close": { "close": {