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

Move review_requested back to the buttons.. Make it work on tag changes

Browse Source
This commit is contained in:
Bryan Housel
2017-08-11 01:12:42 -04:00
parent 1a9614bb9d
commit b172b4602b
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
modules/ui/commit.js
View File

@@ -125,17 +125,6 @@ export function uiCommit(context) {
.text(t('commit.about_changeset_comments'));
var requestReview = fieldSection
.append('p')
.attr('class', 'request-review')
.text(t('commit.request_review'));
requestReview
.append('input')
.attr('type', 'checkbox')
.on('change', toggleRequestReview());
// Warnings
var warnings = body.selectAll('div.warning-section')
.data([context.history().validate(changes)]);
@@ -213,6 +202,18 @@ export function uiCommit(context) {
});
var requestReview = saveSection
.append('p')
.attr('class', 'request-review')
.text(t('commit.request_review'));
var requestReviewField = requestReview
.append('input')
.attr('type', 'checkbox')
.property('checked', isReviewRequested(changeset.tags))
.on('change', toggleRequestReview());
// Buttons
var buttonSection = saveSection
.append('div')
@@ -391,14 +392,11 @@ export function uiCommit(context) {
function toggleRequestReview() {
var toggled = false;
return function() {
var changeset = updateChangeset({ review_requested: (toggled ? 'yes' : undefined) });
var rr = requestReviewField.property('checked');
var changeset = updateChangeset({ review_requested: (rr ? 'yes' : undefined) });
var expanded = !tagSection.selectAll('a.hide-toggle.expanded').empty();
toggled = !toggled;
tagSection
.call(rawTagEditor
.expanded(expanded)
@@ -415,13 +413,34 @@ export function uiCommit(context) {
changed.comment = '';
}
changed.comment = changed.comment.trim();
commentField.property('value', changed.comment);
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);
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) {
var tags = _.clone(changeset.tags);