From 849eadca2331ac2db065edec31008226e1929421 Mon Sep 17 00:00:00 2001
From: Ansis Brammanis <ansis.brammanis@gmail.com>
Date: Thu, 28 Mar 2013 12:13:59 -0400
Subject: [PATCH] less action-less steps in walkthrough

---
 data/intro.yaml              | 2 +-
 data/locales.js              | 5 +++--
 js/id/ui/intro/navigation.js | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/data/intro.yaml b/data/intro.yaml
index 597670744..3e7b41b82 100644
--- a/data/intro.yaml
+++ b/data/intro.yaml
@@ -4,7 +4,7 @@ en:
       drag: "The main map area shows OpenStreetMap data on top of a background. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**"
       select: "Map features are represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**"
       header: "The header shows us the feature type."
-      pane: "The main pane shows the feature's attributes, such as its name and address."
+      pane: "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor with the close button in the top right.**"
     points:
       add: "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**"
       place: "Click to place the point on the map. The point we are adding is a Cafe. **Place the point at the corner of This Street and That Street**"
diff --git a/data/locales.js b/data/locales.js
index 26b21773a..3743d9b93 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -1461,7 +1461,7 @@ locale.en = {
             "drag": "The main map area shows OpenStreetMap data on top of a background. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**",
             "select": "Map features are represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**",
             "header": "The header shows us the feature type.",
-            "pane": "The main pane shows the feature's attributes, such as its name and address."
+            "pane": "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor with the close button in the top right.**"
         },
         "points": {
             "add": "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**",
@@ -1490,7 +1490,8 @@ locale.en = {
             "finish": "Lines can be finished by clicking on the last point again. **Finish drawing the road.**",
             "road": "**Select Road from the grid**",
             "residential": "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**",
-            "describe": "**Name the road and close the feature editor.**"
+            "describe": "**Name the road and close the feature editor.**",
+            "restart": "The road needs to intersect Flower Street."
         },
         "startediting": {
             "help": "More documentation and this walkthrough are available here.",
diff --git a/js/id/ui/intro/navigation.js b/js/id/ui/intro/navigation.js
index 2442d2697..c771bd9f8 100644
--- a/js/id/ui/intro/navigation.js
+++ b/js/id/ui/intro/navigation.js
@@ -62,9 +62,10 @@ iD.ui.intro.navigation = function(context, reveal) {
             if (mode.id !== 'select') return;
             context.on('enter.intro', null);
             context.map().on('move.intro', null);
-            set(function() { reveal('.header', 'intro.navigation.header'); }, 700);
-            set(function() { reveal('.tag-wrap', 'intro.navigation.pane'); }, 4000);
-            set(event.done, 7000);
+            set(function() {
+                reveal('.tag-pane', 'intro.navigation.pane');
+                context.on('exit.intro', event.done);
+            }, 700);
         }
 
     };
@@ -72,6 +73,7 @@ iD.ui.intro.navigation = function(context, reveal) {
     step.exit = function() {
         context.map().on('move.intro', null);
         context.on('enter.intro', null);
+        context.on('exit.intro', null);
         timeouts.forEach(window.clearTimeout);
     };