From cb887f47e3ef18cae62e05f8d09da0910a0332e6 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Sun, 10 Mar 2013 01:40:47 -0500
Subject: [PATCH] fix updating tags from taglist

fixes #965
---
 js/id/ui/tag_editor.js |  1 -
 js/id/ui/taglist.js    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/js/id/ui/tag_editor.js b/js/id/ui/tag_editor.js
index 3bef1b1a9..375171930 100644
--- a/js/id/ui/tag_editor.js
+++ b/js/id/ui/tag_editor.js
@@ -117,7 +117,6 @@ iD.ui.TagEditor = function(context) {
     }
 
     function apply() {
-        event.changeTags();
         event.close();
     }
 
diff --git a/js/id/ui/taglist.js b/js/id/ui/taglist.js
index 2ac6dc9af..25cd7c847 100644
--- a/js/id/ui/taglist.js
+++ b/js/id/ui/taglist.js
@@ -70,7 +70,10 @@ iD.ui.Taglist = function(context) {
             .attr('class', 'key')
             .attr('maxlength', 255)
             .property('value', function(d) { return d.key; })
-            .on('change', function(d) { d.key = this.value; event.change(); });
+            .on('blur', function(d) {
+                d.key = this.value;
+                event.change(taglist.tags());
+            });
 
         inputs.append('span')
             .attr('class', 'input-wrap-position')
@@ -79,7 +82,10 @@ iD.ui.Taglist = function(context) {
             .attr('class', 'value')
             .attr('maxlength', 255)
             .property('value', function(d) { return d.value; })
-            .on('change', function(d) { d.value = this.value; event.change(); })
+            .on('blur', function(d) {
+                d.value = this.value;
+                event.change(taglist.tags());
+            })
             .on('keydown.push-more', pushMore);
 
         inputs.each(bindTypeahead);
@@ -251,6 +257,8 @@ iD.ui.Taglist = function(context) {
 
     function removeTag(d) {
         var tags = taglist.tags();
+        tags[d.key] = '';
+        event.change(tags);
         delete tags[d.key];
         drawTags(tags);
     }