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

Strip old preset's main tags when switching

Browse Source
This commit is contained in:
Ansis Brammanis
2013-02-16 20:24:38 -05:00
parent 83c2fb5c67
commit 9fcda7ffc2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/id/ui/inspector.js
View File

@@ -39,6 +39,7 @@ iD.ui.Inspector = function() {
tagEditor = iD.ui.TagEditor()
.presetData(presetData)
.tags(entity.tags)
.context(context)
.on('message', changeMessage)
.on('choose', function() {

18
js/id/ui/tageditor.js
View File

@@ -4,6 +4,7 @@ iD.ui.TagEditor = function() {
presetData = iD.presetData(),
inspectorbody,
entity,
tags,
presetMatch,
presetUI,
presetGrid,
@@ -13,6 +14,11 @@ iD.ui.TagEditor = function() {
function tageditor(selection, tagview, preset) {
entity = selection.datum();
if (preset) {
tags = _.omit(tags, _.keys(presetMatch.match.tags));
}
presetMatch = preset || presetData.matchTags(entity);
selection.html('');
@@ -97,7 +103,7 @@ iD.ui.TagEditor = function() {
var taglistwrap = editorwrap.append('div').call(tagList);
tageditor.tags(entity.tags);
tageditor.tags(tags);
}
function drawHead(selection) {
@@ -112,12 +118,16 @@ iD.ui.TagEditor = function() {
.text(entity.friendlyName());
}
tageditor.tags = function(tags) {
tageditor.tags = function(newtags) {
if (!arguments.length) {
return _.extend(presetUI.tags(), tagList.tags());
} else {
presetUI.change(tags);
tagList.tags(_.omit(tags, _.keys(presetUI.tags() || {})));
tags = newtags;
if (presetUI && tagList) {
presetUI.change(tags);
tagList.tags(_.omit(tags, _.keys(presetUI.tags() || {})));
}
return tageditor;
}
};