Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Merge pull request #3477 from halfdan/duplicate-notification

Browse source 
Avoids duplicate notification / transition
This commit is contained in:
Hannah Wolfe 2014-07-31 15:47:19 +01:00
commit 45b4b95b1d
3 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/client/controllers/setup.js
View file

@ -35,9 +35,6 @@ var SetupController = Ember.ObjectController.extend(ValidationEngine, {
self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', { self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', {
identification: self.get('email'), identification: self.get('email'),
password: self.get('password') password: self.get('password')
}).then(function () {
self.send('signedIn');
self.transitionToRoute(SimpleAuth.Configuration.routeAfterAuthentication);
}); });
}, function (resp) { }, function (resp) {
self.toggleProperty('submitting'); self.toggleProperty('submitting');

3
core/client/controllers/signup.js
View file

@ -36,9 +36,6 @@ var SignupController = Ember.ObjectController.extend(ValidationEngine, {
self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', { self.get('session').authenticate('simple-auth-authenticator:oauth2-password-grant', {
identification: self.get('email'), identification: self.get('email'),
password: self.get('password') password: self.get('password')
}).then(function () {
self.send('signedIn');
self.transitionToRoute(SimpleAuth.Configuration.routeAfterAuthentication);
}); });
}, function (resp) { }, function (resp) {
self.toggleProperty('submitting'); self.toggleProperty('submitting');

6
core/client/routes/application.js
View file

@ -6,12 +6,6 @@ var ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shor
'esc': 'closePopups' 'esc': 'closePopups'
}, },
setupController: function () {
Ember.run.next(this, function () {
this.send('loadServerNotifications');
});
},
actions: { actions: {
closePopups: function () { closePopups: function () {
this.get('popover').closePopovers(); this.get('popover').closePopovers();