CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-31 01:09:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where the keyboard shortcuts screen would only display the first tab (close #8137)

Browse Source
This commit is contained in:
Quincy Morgan
2020-10-30 09:48:48 -04:00
parent e40180d0c4
commit e017073142
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/ui/shortcuts.js
View File

@@ -14,6 +14,7 @@ export function uiShortcuts(context) {
var _activeTab = 0;
var _modalSelection;
var _selection = d3_select(null);
var _dataShortcuts;
function shortcutsModal(_modalSelection) {
@@ -29,12 +30,17 @@ export function uiShortcuts(context) {
.html(t.html('shortcuts.title'));
fileFetcher.get('shortcuts')
.then(function(data) { content.call(render, data); })
.then(function(data) {
_dataShortcuts = data;
content.call(render);
})
.catch(function() { /* ignore */ });
}
function render(selection, dataShortcuts) {
function render(selection) {
if (!_dataShortcuts) return;
var wrapper = selection
.selectAll('.wrapper')
.data([0]);
@@ -56,18 +62,18 @@ export function uiShortcuts(context) {
var tabs = tabsBar
.selectAll('.tab')
.data(dataShortcuts);
.data(_dataShortcuts);
var tabsEnter = tabs
.enter()
.append('a')
.attr('class', 'tab')
.attr('href', '#')
.on('click', function (d3_event) {
.on('click', function (d3_event, d) {
d3_event.preventDefault();
var i = tabs.nodes().indexOf(this);
var i = _dataShortcuts.indexOf(d);
_activeTab = i;
render(selection, dataShortcuts);
render(selection);
});
tabsEnter
@@ -83,7 +89,7 @@ export function uiShortcuts(context) {
var shortcuts = shortcutsList
.selectAll('.shortcut-tab')
.data(dataShortcuts);
.data(_dataShortcuts);
var shortcutsEnter = shortcuts
.enter()