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

Merge pull request #6211 from AndreasHae/feature/split-multiple-tags

Browse Source 
Handle multiple tags when splitting up in tag editor
This commit is contained in:
Bryan Housel
2019-04-23 11:05:03 -04:00
committed by GitHub
parent fb3d6746a1 e49fdce215
commit 1d4770a3c6
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/raw_tag_editor.js
+20 -14
View File
@@ -301,19 +301,6 @@ export function uiRawTagEditor(context) {
var inputVal = d3_select(row).selectAll('input.value');
var vNew = utilGetSetValue(inputVal);
// if the key looks like "key=value", split them up - #5024
if (kNew.indexOf('=') !== -1) {
var parts = kNew
.split('=')
.map(function(str) { return str.trim(); })
.filter(Boolean);
if (parts.length === 2) {
kNew = parts[0];
vNew = parts[1];
}
}
// allow no change if the key should be readonly
if (isReadOnly({ key: kNew })) {
this.value = kOld;
@@ -340,7 +327,26 @@ export function uiRawTagEditor(context) {
if (kOld) {
_pendingChange[kOld] = undefined;
}
_pendingChange[kNew] = vNew;
// if the key looks like "key=value key2=value2", split them up - #5024
var keys = (kNew.match(/[\w_]+=/g) || []).map(function (key) { return key.slice(0, -1); });
var vals = keys.length === 0
? []
: kNew
.split(new RegExp(keys.map(function (key) { return key.replace('_', '\\_'); }).join('|')))
.splice(1)
.map(function (val) { return val.slice(1).trim(); });
if (keys.length > 0) {
kNew = keys[0];
vNew = vals[0];
keys.forEach(function (key, i) {
_pendingChange[key] = vals[i];
});
} else {
_pendingChange[kNew] = vNew;
}
d.key = kNew; // update datum to avoid exit/enter on tag update
d.value = vNew;