From b95aa089003244088d09514051b8b4aa2b7124de Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 24 Jul 2018 16:22:21 -0400
Subject: [PATCH] Add cancel button, simplify button code

---
 data/core.yaml            |  2 +-
 dist/locales/en.json      |  2 +-
 modules/ui/note_editor.js | 77 +++++++++++++++++++++++----------------
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index df3ba1d3f..3c4d1420b 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -644,7 +644,7 @@ en:
     report: Report
     new: New Note
     newDescription: "Describe the issue."
-    newNote: Add Note
+    save: Save Note
     login: You must log in to change or comment on this note.
     upload_explanation: "Your comments will be publicly visible to all OpenStreetMap users."
     upload_explanation_with_user: "Your comments as {user} will be publicly visible to all OpenStreetMap users."
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ed1de77b6..bff2dd272 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -780,7 +780,7 @@
             "report": "Report",
             "new": "New Note",
             "newDescription": "Describe the issue.",
-            "newNote": "Add Note",
+            "save": "Save Note",
             "login": "You must log in to change or comment on this note.",
             "upload_explanation": "Your comments will be publicly visible to all OpenStreetMap users.",
             "upload_explanation_with_user": "Your comments as {user} will be publicly visible to all OpenStreetMap users."
diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js
index e5d6a081a..235938511 100644
--- a/modules/ui/note_editor.js
+++ b/modules/ui/note_editor.js
@@ -9,8 +9,8 @@ import { services } from '../services';
 import { modeBrowse } from '../modes';
 import { svgIcon } from '../svg';
 
-import { uiField } from './field';
-import { uiFormFields } from './form_fields';
+// import { uiField } from './field';
+// import { uiFormFields } from './form_fields';
 
 import {
     uiNoteComments,
@@ -30,10 +30,10 @@ export function uiNoteEditor(context) {
     var noteComments = uiNoteComments();
     var noteHeader = uiNoteHeader();
 
-    var formFields = uiFormFields(context);
+    // var formFields = uiFormFields(context);
 
     var _note;
-    var _fieldsArr;
+    // var _fieldsArr;
 
 
     function noteEditor(selection) {
@@ -48,8 +48,6 @@ export function uiNoteEditor(context) {
             .append('button')
             .attr('class', 'fr note-editor-close')
             .on('click', function() {
-                var osm = services.osm;
-                if (_note.isNew()) { osm.removeNote(_note); } // delete new note
                 context.enter(modeBrowse(context));
             })
             .call(svgIcon('#iD-icon-close'));
@@ -297,27 +295,57 @@ export function uiNoteEditor(context) {
             .append('div')
             .attr('class', 'buttons');
 
-        buttonEnter
-            .append('button')
-            .attr('class', function() {
-                return _note.isNew() ? 'button add-note-button action' : 'button status-button action';
-            })
-            .append('span')
-            .attr('class', 'label');
+        if (_note.isNew()) {
+            buttonEnter
+                .append('button')
+                .attr('class', 'button cancel-button secondary-action')
+                .text(t('confirm.cancel'));
+
+            buttonEnter
+                .append('button')
+                .attr('class', 'button save-button action')
+                .text(t('note.save'));
+
+        } else {
+            buttonEnter
+                .append('button')
+                .attr('class', 'button status-button action');
 
-        if (!_note.isNew()) {
             buttonEnter
                 .append('button')
                 .attr('class', 'button comment-button action')
-                .append('span')
-                .attr('class', 'label')
                 .text(t('note.comment'));
         }
 
+
         // update
         buttonSection = buttonSection
             .merge(buttonEnter);
 
+        buttonSection.select('.cancel-button')   // select and propagate data
+            .on('click.cancel', function(d) {
+                this.blur();    // avoid keeping focus on the button - #4641
+                var osm = services.osm;
+                if (osm) {
+                    osm.removeNote(d);
+                }
+                context.enter(modeBrowse(context));
+            });
+
+        buttonSection.select('.save-button')   // select and propagate data
+            .attr('disabled', function(d) {
+                return (hasAuth && d.status === 'open' && d.newComment) ? null : true;
+            })
+            .on('click.save', function(d) {
+                this.blur();    // avoid keeping focus on the button - #4641
+                var osm = services.osm;
+                if (osm) {
+                    osm.postNoteCreate(d, function(err, note) {
+                        dispatch.call('change', note);
+                    });
+                }
+            });
+
         buttonSection.select('.status-button')   // select and propagate data
             .attr('disabled', (hasAuth ? null : true))
             .text(function(d) {
@@ -340,7 +368,7 @@ export function uiNoteEditor(context) {
             .attr('disabled', function(d) {
                 return (hasAuth && d.status === 'open' && d.newComment) ? null : true;
             })
-            .on('click.save', function(d) {
+            .on('click.comment', function(d) {
                 this.blur();    // avoid keeping focus on the button - #4641
                 var osm = services.osm;
                 if (osm) {
@@ -349,21 +377,6 @@ export function uiNoteEditor(context) {
                     });
                 }
             });
-
-        buttonSection.select('.add-note-button')   // select and propagate data
-            .text(t('note.newNote'))
-            .attr('disabled', function(d) {
-                return (d.status === 'open' && d.newComment) ? null : true;
-            })
-            .on('click.save', function(d) {
-                this.blur();    // avoid keeping focus on the button - #4641
-                var osm = services.osm;
-                if (osm) {
-                    osm.postNoteCreate(d, function(err, note) {
-                        dispatch.call('change', note);
-                    });
-                }
-            });
     }