From 51ed5b6eb295af581edd555a8728809eb7fc9bff Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 15 Dec 2015 10:35:57 -0500
Subject: [PATCH] =?UTF-8?q?Better=20save=20blocking=20in=20intro=20(closes?=
 =?UTF-8?q?=20#1795)=20Previous=20code=20blocked=20the=20button=20click=20?=
 =?UTF-8?q?handler=20only,=20not=20the=20=E2=8C=98S=20keybinding?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/id/ui/intro.js | 10 +++-------
 js/id/ui/save.js  |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/js/id/ui/intro.js b/js/id/ui/intro.js
index 83e0b3241..cb1d04e7f 100644
--- a/js/id/ui/intro.js
+++ b/js/id/ui/intro.js
@@ -17,6 +17,9 @@ iD.ui.intro = function(context) {
             baseEntities = context.history().graph().base().entities,
             introGraph;
 
+        // Block saving
+        context.inIntro(true);
+
         // Load semi-real data used in intro
         context.connection().toggle(false).flush();
         context.history().reset();
@@ -28,12 +31,6 @@ iD.ui.intro = function(context) {
         context.history().merge(d3.values(iD.Graph().load(introGraph).entities));
         context.background().bing();
 
-        // Block saving
-        var savebutton = d3.select('#bar button.save'),
-            save = savebutton.on('click');
-        savebutton.on('click', null);
-        context.inIntro(true);
-
         d3.select('.background-layer').style('opacity', 1);
 
         var curtain = d3.curtain();
@@ -67,7 +64,6 @@ iD.ui.intro = function(context) {
             context.map().centerZoom(center, zoom);
             window.location.replace(hash);
             context.inIntro(false);
-            d3.select('#bar button.save').on('click', save);
         });
 
         var navwrap = selection.append('div').attr('class', 'intro-nav-wrap fillD');
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index d47ac18e8..212e5c85b 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -8,7 +8,7 @@ iD.ui.Save = function(context) {
 
     function save() {
         d3.event.preventDefault();
-        if (!saving() && history.hasChanges()) {
+        if (!context.inIntro() && !saving() && history.hasChanges()) {
             context.enter(iD.modes.Save(context));
         }
     }