Finish signup process, including state restoration

framework/core/ember/app/controllers/signup.js

@@ -28,6 +28,7 @@ export default Ember.Controller.extend(ModalController, {
       return user.save().then(function(user) {
         controller.set('welcomeUser', user);
         controller.set('loading', false);
+        controller.send('saveState');
       }, function(reason) {
         controller.set('loading', false);
       });

framework/core/ember/app/routes/application.js

@@ -7,6 +7,13 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
   activate: function() {
     if (!Ember.isEmpty(FLARUM_ALERT)) {
       this.controllerFor('alerts').send('alert', AlertMessage.create(FLARUM_ALERT));
+      FLARUM_ALERT = null;
+    }
+
+    var restoreUrl = localStorage.getItem('restoreUrl');
+    if (restoreUrl && this.get('session.isAuthenticated')) {
+      this.transitionTo(restoreUrl);
+      localStorage.removeItem('restoreUrl');
     }
   },
 
@@ -42,6 +49,10 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
 
     sessionChanged: function() {
       this.refresh();
+    },
+
+    saveState: function() {
+      localStorage.setItem('restoreUrl', this.router.get('url'));
     }
   }
 });

framework/core/ember/app/templates/signup.hbs

@@ -28,7 +28,7 @@
 {{ui/loading-indicator classNameBindings=":modal-loading loading:active"}}
 
 {{#if welcomeUser}}
-  <div {{bind-attr class=":signup-welcome :fade" style=welcomeStyle}}>
+  <div {{bind-attr class=":signup-welcome" style=welcomeStyle}}>
     {{user-avatar welcomeUser}}
     <h3>Welcome, {{welcomeUser.username}}!</h3>
 

framework/core/ember/app/views/signup.js

@@ -9,10 +9,10 @@ export default Ember.View.extend(ModalView, {
   didInsertElement: function() {
   },
 
-  welcomeUserDidChange: Ember.observer('welcomeUser', function() {
-    if (this.get('welcomeUser')) {
+  welcomeUserDidChange: Ember.observer('controller.welcomeUser', function() {
+    if (this.get('controller.welcomeUser')) {
       Ember.run.scheduleOnce('afterRender', this, function() {
-        this.$('.signup-welcome').addClass('in');
+        this.$('.signup-welcome').hide().fadeIn();
       });
     }
   })