From 49e5eb8317610eb3be0bf0ed4976bdd4519af953 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Wed, 20 Feb 2013 17:35:50 -0500
Subject: [PATCH] Fix name input saving and updating

---
 js/id/modes/select.js | 1 +
 js/id/ui/tageditor.js | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index 43b110e03..715c499e6 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -125,6 +125,7 @@ iD.modes.Select = function(context, selection, initial) {
                 if (!_.isEqual(entity.tags, newEntity.tags)) {
                     inspector.tags(newEntity.tags);
                 }
+                entity = newEntity;
             }
         });
 
diff --git a/js/id/ui/tageditor.js b/js/id/ui/tageditor.js
index 12a4bb203..885f44253 100644
--- a/js/id/ui/tageditor.js
+++ b/js/id/ui/tageditor.js
@@ -5,6 +5,7 @@ iD.ui.TagEditor = function() {
         inspectorbody,
         entity,
         tags,
+        name,
         presetMatch,
         presetUI,
         presetGrid,
@@ -61,13 +62,13 @@ iD.ui.TagEditor = function() {
             namelabel = namewrap.append('h4')
                 .text('Name');
 
-        var name = namewrap.append('input')
+        name = namewrap.append('input')
             .attr('placeholder', 'name')
             .attr('type', 'text')
             .property('value', function() {
                 return entity.tags.name || '';
             })
-            .on('keyup', function() {
+            .on('blur', function() {
                 var tags = tageditor.tags();
                 tags.name = this.value;
                 tageditor.tags(tags);
@@ -132,6 +133,7 @@ iD.ui.TagEditor = function() {
         } else {
             tags = newtags;
             if (presetUI && tagList) {
+                name.property('value', tags.name || '');
                 presetUI.change(tags);
                 tagList.tags(_.omit(tags, _.keys(presetUI.tags() || {})));
             }