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

Don't instantiate uiShortcuts or its keybinding multiple times

Browse Source
This commit is contained in:
Quincy Morgan
2020-10-05 10:57:18 -04:00
parent 3ad4d7bd98
commit 0c38363406
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ui/init.js
View File

@@ -418,7 +418,7 @@ export function uiInit(context) {
}
context.container()
.call(uiShortcuts(context));
.call(ui.shortcuts);
}
var osm = context.connection();
@@ -499,6 +499,8 @@ export function uiInit(context) {
ui.photoviewer = uiPhotoviewer(context);
ui.shortcuts = uiShortcuts(context);
ui.onResize = function(withPan) {
var map = context.map();

3
modules/ui/panes/help.js
View File

@@ -4,7 +4,6 @@ import { event as d3_event } from 'd3-selection';
import marked from 'marked';
import { svgIcon } from '../../svg/icon';
import { uiIntro } from '../intro/intro';
import { uiShortcuts } from '../shortcuts';
import { uiPane } from '../pane';
import { t, localizer } from '../../core/localizer';
@@ -353,7 +352,7 @@ export function uiPaneHelp(context) {
function clickShortcuts() {
d3_event.preventDefault();
context.container().call(uiShortcuts(context), true);
context.container().call(context.ui().shortcuts, true);
}
var toc = content

27
modules/ui/shortcuts.js
View File

@@ -16,20 +16,6 @@ export function uiShortcuts(context) {
var _selection = d3_select(null);
context.keybinding()
.on([t('shortcuts.toggle.key'), '?'], function () {
if (context.container().selectAll('.modal-shortcuts').size()) { // already showing
if (_modalSelection) {
_modalSelection.close();
_modalSelection = null;
}
} else {
_modalSelection = uiModal(_selection);
_modalSelection.call(shortcutsModal);
}
});
function shortcutsModal(_modalSelection) {
_modalSelection.select('.modal')
.classed('modal-shortcuts', true);
@@ -264,6 +250,19 @@ export function uiShortcuts(context) {
if (show) {
_modalSelection = uiModal(selection);
_modalSelection.call(shortcutsModal);
} else {
context.keybinding()
.on([t('shortcuts.toggle.key'), '?'], function () {
if (context.container().selectAll('.modal-shortcuts').size()) { // already showing
if (_modalSelection) {
_modalSelection.close();
_modalSelection = null;
}
} else {
_modalSelection = uiModal(_selection);
_modalSelection.call(shortcutsModal);
}
});
}
};
}