CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 16:19:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Display name suggestion presets on 2 lines

Browse Source 
(closes #5514)
This commit is contained in:
Bryan Housel
2018-11-26 21:55:13 -05:00
parent b719a45e1e
commit 822917466c
3 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/entity_editor.js
+17 -3
View File
@@ -95,7 +95,9 @@ export function uiEntityEditor(context) {
.attr('class', 'preset-list-button preset-reset')
.call(tooltip().title(t('inspector.back_tooltip')).placement('bottom'))
.append('div')
.attr('class', 'label');
.attr('class', 'label')
.append('div')
.attr('class', 'label-inner');
enter
.append('div')
@@ -142,8 +144,20 @@ export function uiEntityEditor(context) {
.preset(_activePreset)
);
body.select('.preset-list-item .label')
.text(_activePreset.name());
var label = body.select('.label-inner');
var nameparts = label.selectAll('.namepart')
.data(_activePreset.name().split(' - '), function(d) { return d; });
nameparts.exit()
.remove();
nameparts
.enter()
.append('div')
.attr('class', 'namepart')
.text(function(d) { return d; });
body.select('.preset-editor')
.call(presetEditor
modules/ui/preset_list.js
+18 -4
View File
@@ -262,7 +262,7 @@ export function uiPresetList(context) {
(textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward') : '#iD-icon-down';
d3_select(this)
.classed('expanded', !isExpanded);
d3_select(this).selectAll('div.label svg.icon use')
d3_select(this).selectAll('div.label-inner svg.icon use')
.attr('href', iconName);
item.choose();
}
@@ -301,9 +301,13 @@ export function uiPresetList(context) {
var label = button
.append('div')
.attr('class', 'label');
.attr('class', 'label')
.append('div')
.attr('class', 'label-inner');
label
.append('div')
.attr('class', 'namepart')
.call(svgIcon((textDirection === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward'), 'inline'))
.append('span')
.html(function() { return preset.name() + '…'; });
@@ -352,16 +356,26 @@ export function uiPresetList(context) {
var wrap = selection.append('div')
.attr('class', 'preset-list-button-wrap col12');
wrap.append('button')
var button = wrap.append('button')
.attr('class', 'preset-list-button')
.call(uiPresetIcon()
.geometry(context.geometry(_entityID))
.preset(preset))
.on('click', item.choose)
.on('keydown', itemKeydown)
var label = button
.append('div')
.attr('class', 'label')
.text(preset.name());
.append('div')
.attr('class', 'label-inner');
var parts = label.selectAll('.namepart')
.data(preset.name().split(' - '))
.enter()
.append('div')
.attr('class', 'namepart')
.text(function(d) { return d; });
wrap.call(item.reference.button);
selection.call(item.reference.body);