From ff1cb3598d6bc38230453bdbf93fd31d01b2b97f Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Wed, 2 Aug 2017 15:18:09 -0700
Subject: [PATCH] Remove step 1 of previous setup flow, replaced by choice
 screen

FREEBIE
---
 background.html          | 17 -----------------
 js/views/install_view.js | 12 ++++++++++--
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/background.html b/background.html
index c9df06964..11d2a46f8 100644
--- a/background.html
+++ b/background.html
@@ -646,23 +646,6 @@
   </script>
 
   <script type='text/x-tmpl-mustache' id='install_flow_template'>
-    <div id='step1' class='step hidden'>
-      <div class='inner'>
-        <div class='step-body'>
-          <img id='signal-icon' src='images/icon_250.png'/>
-          <h1>{{ installWelcome }}</h1>
-          <p>{{ installTagline }}</p>
-        </div>
-        <div class='nav'>
-          <div> <a class='button step2'>{{ installGetStartedButton }}</a> </div>
-          <div class='dot-container'>
-            <span class='dot step1 selected'></span>
-            <span class='dot step2'></span>
-            <span class='dot step3'></span>
-          </div>
-        </div>
-      </div>
-    </div>
 
     <div id='step2' class='step hidden'>
       <div class='inner'>
diff --git a/js/views/install_view.js b/js/views/install_view.js
index 5992c1634..a9fd0d930 100644
--- a/js/views/install_view.js
+++ b/js/views/install_view.js
@@ -44,7 +44,7 @@
             }
 
             this.$('#device-name').val(deviceName);
-            this.$('#step1').show();
+            this.$('#step2').show();
             this.connect();
             this.on('disconnected', this.reconnect);
 
@@ -63,6 +63,10 @@
             ).catch(this.handleDisconnect.bind(this));
         },
         handleDisconnect: function(e) {
+            if (this.canceled) {
+                return;
+            }
+
             if (e.message === 'websocket closed') {
                 this.showConnectionError();
                 this.trigger('disconnected');
@@ -78,11 +82,15 @@
         events: function() {
             return {
                 'click .error-dialog .ok': 'connect',
-                'click .step1': this.selectStep.bind(this, 1),
+                'click .step1': 'onCancel',
                 'click .step2': this.selectStep.bind(this, 2),
                 'click .step3': this.selectStep.bind(this, 3)
             };
         },
+        onCancel: function() {
+            this.canceled = true;
+            this.trigger('cancel');
+        },
         clearQR: function() {
             this.$('#qr').text(i18n("installConnecting"));
         },