Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Remove modal-wrapper whenever modal dialog is closed #5579

Merged
redmunds merged 6 commits into from
Oct 23, 2013
Merged

Remove modal-wrapper whenever modal dialog is closed #5579

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4680443
Fix dialogs not hiding properly
WebsiteDeveloper Oct 18, 2013
a0f4b15
Fix dialog button focus behavior
WebsiteDeveloper Oct 19, 2013
a0649c6
Fix travis build
WebsiteDeveloper Oct 19, 2013
0d76828
Simplify change
WebsiteDeveloper Oct 19, 2013
c252576
Fix JSLint errors
WebsiteDeveloper Oct 21, 2013
d79cc5e
Fix review issues
WebsiteDeveloper Oct 23, 2013
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
15 changes: 9 additions & 6 deletions src/widgets/Dialogs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ define(function (require, exports, module) {
function _dismissDialog($dlg, buttonId) {
$dlg.data("buttonId", buttonId);
$dlg.modal("hide");
$(".modal-wrapper:last").remove();
}

/**
Expand Down Expand Up @@ -120,9 +119,10 @@ define(function (require, exports, module) {
* @return {boolean}
*/
var _keydownHook = function (e, autoDismiss) {
var $primaryBtn = this.find(".primary"),
buttonId = null,
which = String.fromCharCode(e.which);
var $primaryBtn = this.find(".primary"),
buttonId = null,
which = String.fromCharCode(e.which),
$focusedElement = this.find(".dialog-button:focus, a:focus");

// There might be a textfield in the dialog's UI; don't want to mistake normal typing for dialog dismissal
var inTextArea = (e.target.tagName === "TEXTAREA"),
Expand All @@ -133,11 +133,11 @@ define(function (require, exports, module) {
} else if (e.which === KeyEvent.DOM_VK_ESCAPE) {
buttonId = DIALOG_BTN_CANCEL;
} else if (e.which === KeyEvent.DOM_VK_RETURN && !inTextArea) { // enter key in single-line text input still dismisses
// Click primary button
// Click primary
$primaryBtn.click();
} else if (e.which === KeyEvent.DOM_VK_SPACE) {
// Space bar on focused button or link
this.find(".dialog-button:focus, a:focus").click();
$focusedElement.click();
} else if (brackets.platform === "mac") {
// CMD+D Don't Save
if (e.metaKey && (which === "D")) {
Expand Down Expand Up @@ -259,6 +259,9 @@ define(function (require, exports, module) {

// Remove our global keydown handler.
KeyBindingManager.removeGlobalKeydownHook(keydownHook);

//Remove wrapper
$(".modal-wrapper:last").remove();
}).one("shown", function () {
// Set focus to the default button
var primaryBtn = $dlg.find(".primary");
Expand Down