thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some loading stuff

Browse source
This commit is contained in:
Matthew Dillon 2015-07-17 07:32:53 -08:00
parent 1bb5dc67b2
commit fb57534b64
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/pods/login/controller.js
View file

@ -7,13 +7,13 @@ export default Ember.Controller.extend({
let session = this.get('session'); let session = this.get('session');
let authenticator = 'simple-auth-authenticator:token'; let authenticator = 'simple-auth-authenticator:token';
this.set('loading', true);
// Manually clean up because there might not be a transition // Manually clean up because there might not be a transition
this.get('flashMessages').clearMessages(); this.get('flashMessages').clearMessages();
this.transitionTo('loading').then(() => {
session.authenticate(authenticator, credentials).then(null, (error)=> { session.authenticate(authenticator, credentials).then(null, (error)=> {
this.set('loading', false);
this.get('flashMessages').error(error.error); this.get('flashMessages').error(error.error);
}); });
});
} }
} }
}); });

4
app/pods/login/template.hbs
View file

@ -1,7 +1,4 @@
{{#x-application invalidateSession="invalidateSession"}} {{#x-application invalidateSession="invalidateSession"}}
{{#if loading}}
{{loading-panel}}
{{else}}
<form {{action "authenticate" on="submit"}}> <form {{action "authenticate" on="submit"}}>
<h2>Log In</h2> <h2>Log In</h2>
{{input value=identification type="text" placeholder="Email"}} {{input value=identification type="text" placeholder="Email"}}
@ -12,5 +9,4 @@
<div> <div>
Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}} Forget your password? {{link-to 'Request a lockout email.' 'users.requestlockouthelp'}}
</div> </div>
{{/if}}
{{/x-application}} {{/x-application}}

1
app/pods/protected/loading/template.hbs Normal file
View file

@ -0,0 +1 @@
{{loading-panel}}