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

WIP: persist uiRawTagEditor, uiChangesetEditor between renders

Browse Source
This commit is contained in:
Bryan Housel
2017-08-13 12:08:49 -04:00
parent e0266da083
commit fba6871e5c
1 changed files with 107 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

207
modules/ui/commit.js
View File

@@ -23,18 +23,21 @@ var readOnlyTags = ['created_by', 'imagery_used', 'host', 'locale'];
export function uiCommit(context) {
var dispatch = d3.dispatch('cancel', 'save');
var dispatch = d3.dispatch('cancel', 'save'),
_selection;
var changesetEditor = uiChangesetEditor(context)
.on('change', changeTags);
var rawTagEditor = uiRawTagEditor(context)
.on('change', changeTags);
function commit(selection) {
_selection = selection;
var osm = context.connection();
if (!osm) return;
var changesetEditor = uiChangesetEditor(context)
.on('change', changeTags);
var rawTagEditor = uiRawTagEditor(context)
.on('change', changeTags);
var changes = context.history().changes(),
summary = context.history().difference().summary(),
comment = context.storage('comment') || '',
@@ -320,7 +323,7 @@ export function uiCommit(context) {
);
// TODO check this below...
// TODO check this below (maybe refactor to own module)...
// Changes
var changeSection = body.selectAll('.modal-section.commit-section')
@@ -416,29 +419,29 @@ export function uiCommit(context) {
}
function checkComment(comment) {
// Save button disabled if there is no comment..
d3.selectAll('.save-section .save-button')
.attr('disabled', (comment.length ? null : true));
// function checkComment(comment) {
// // Save button disabled if there is no comment..
// d3.selectAll('.save-section .save-button')
// .attr('disabled', (comment.length ? null : true));
// // Warn if comment mentions Google..
// var googleWarning = commentWarning
// .html('')
// .selectAll('a')
// .data(comment.match(/google/i) ? [true] : []);
// // // Warn if comment mentions Google..
// // var googleWarning = commentWarning
// // .html('')
// // .selectAll('a')
// // .data(comment.match(/google/i) ? [true] : []);
// googleWarning.exit()
// .remove();
// // googleWarning.exit()
// // .remove();
// googleWarning.enter()
// .append('a')
// .attr('target', '_blank')
// .attr('tabindex', -1)
// .call(svgIcon('#icon-alert', 'inline'))
// .attr('href', t('commit.google_warning_link'))
// .append('span')
// .text(t('commit.google_warning'));
}
// // googleWarning.enter()
// // .append('a')
// // .attr('target', '_blank')
// // .attr('tabindex', -1)
// // .call(svgIcon('#icon-alert', 'inline'))
// // .attr('href', t('commit.google_warning_link'))
// // .append('span')
// // .text(t('commit.google_warning'));
// }
// function changeComment(onInput) {
@@ -482,81 +485,85 @@ export function uiCommit(context) {
);
}
function changeTags(changed, onInput) {
// if (changed.hasOwnProperty('comment')) {
// if (changed.comment === undefined) {
// changed.comment = '';
// }
// changed.comment = changed.comment.trim();
// commentField
// .property('value', changed.comment);
// }
if (changed.hasOwnProperty('comment')) {
if (changed.comment === undefined) {
changed.comment = '';
}
// if (!onInput) {
// changed.comment = changed.comment.trim();
// }
// commentField
// .property('value', changed.comment);
}
if (changed.hasOwnProperty('review_requested')) {
if (changed.review_requested === undefined) {
requestReviewField
.property('checked', false);
} else {
changed.review_requested = changed.review_requested.trim();
requestReviewField
.property('checked', isReviewRequested(changed));
}
}
updateChangeset(changed, onInput);
if (changed.hasOwnProperty('comment')) {
checkComment(changed.comment);
}
commit(selection);
// utilTriggerEvent(commentField, 'input');
}
function isReviewRequested(tags) {
var rr = tags.review_requested;
if (rr === undefined) return false;
rr = rr.trim().toLowerCase();
return !(rr === '' || rr === 'no');
}
function updateChangeset(changed, onInput) {
var tags = _.clone(changeset.tags);
_.forEach(changed, function(v, k) {
k = k.trim().substr(0, 255);
if (readOnlyTags.indexOf(k) !== -1) return;
if (k !== '' && v !== undefined) {
if (!onInput) {
tags[k] = v.trim().substr(0, 255);
}
} else {
delete tags[k];
}
});
if (!_.isEqual(changeset.tags, tags)) {
changeset = changeset.update({ tags: tags });
}
}
}
function changeTags(changed, onInput) {
// if (changed.hasOwnProperty('comment')) {
// if (changed.comment === undefined) {
// changed.comment = '';
// }
// changed.comment = changed.comment.trim();
// commentField
// .property('value', changed.comment);
// }
if (changed.hasOwnProperty('comment')) {
if (changed.comment === undefined) {
changed.comment = '';
}
// if (!onInput) {
// changed.comment = changed.comment.trim();
// }
// commentField
// .property('value', changed.comment);
}
// if (changed.hasOwnProperty('review_requested')) {
// if (changed.review_requested === undefined) {
// requestReviewField
// .property('checked', false);
// } else {
// changed.review_requested = changed.review_requested.trim();
// requestReviewField
// .property('checked', isReviewRequested(changed));
// }
// }
updateChangeset(changed, onInput);
// if (changed.hasOwnProperty('comment')) {
// checkComment(changed.comment);
// }
if (_selection) {
_selection.call(commit);
}
// utilTriggerEvent(commentField, 'input');
}
function isReviewRequested(tags) {
var rr = tags.review_requested;
if (rr === undefined) return false;
rr = rr.trim().toLowerCase();
return !(rr === '' || rr === 'no');
}
function updateChangeset(changed, onInput) {
var tags = _.clone(changeset.tags);
_.forEach(changed, function(v, k) {
k = k.trim().substr(0, 255);
if (readOnlyTags.indexOf(k) !== -1) return;
if (k !== '' && v !== undefined) {
if (onInput) {
tags[k] = v;
} else {
tags[k] = v.trim().substr(0, 255);
}
} else {
delete tags[k];
}
});
if (!_.isEqual(changeset.tags, tags)) {
changeset = changeset.update({ tags: tags });
}
}
commit.reset = function() {
changeset = null;