CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-27 07:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't rely on modalSelection to indicate modal is visible

Browse Source 
The modal can be dismissed other ways (Esc, click 'X', etc)
This commit is contained in:
Bryan Housel
2017-06-04 22:49:46 -04:00
parent 2555f82631
commit eb80a333cf
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/ui/shortcuts.js
View File

@@ -18,22 +18,25 @@ export function uiShortcuts() {
var keybinding = d3keybinding('shortcuts')
.on(['?', '⇧/'], function () {
if (modalSelection) {
modalSelection.close();
modalSelection = null;
return;
if (d3.selectAll('.modal-shortcuts').size()) { // already showing
if (modalSelection) {
modalSelection.close();
modalSelection = null;
}
} else {
modalSelection = uiModal(savedSelection);
shortcutsModal(modalSelection);
}
modalSelection = uiModal(savedSelection);
shortcutsModal(modalSelection);
});
d3.select(document)
.call(keybinding);
function shortcutsModal(modalSelection) {
modalSelection.select('.modal')
.attr('class', 'modal modal-shortcuts fillL col6');
.classed('modal-shortcuts', true);
var shortcutsModal = modalSelection.select('.content');
@@ -169,7 +172,6 @@ export function uiShortcuts() {
shortcutKeys
.selectAll('kbd.shortcut')
.data(function (d) {
var arr;
if (detected.os === 'win' && d.text === 'shortcuts.editing.commands.redo') {
return [{
shortcut: 'Y',