use let instead of var so that it captures a closure per loop iteration.

2 files changed, 8 insertions, 10 deletions

diff --git a/app/boot/wire-up-components-into.js b/app/boot/wire-up-components-into.js
index bb192ea..0f112c7 100644
--- a/app/boot/wire-up-components-into.js
+++ b/app/boot/wire-up-components-into.js
@@ -10,10 +10,7 @@ export default class WireUpComponentsInto {
   }
 
   run() {
-    this.registry.register('eventAggregator', (container) => {
-      return new EventAggregator();
-    }).asSingleton();
-
+    this.registry.register('eventAggregator', EventAggregator).asSingleton();
     this.registry.register('router', (container) => {
       return new Router({
         eventAggregator: container.resolve('eventAggregator')
@@ -25,7 +22,7 @@ export default class WireUpComponentsInto {
   }
 
   registerCommandsInto(registry) {
-    for (var command in commands) {
+    for (let command in commands) {
       console.log(`registering: ${command}`);
       registry.register('command', (container) => {
         return new commands[command](container.resolve('eventAggregator'));
@@ -37,7 +34,7 @@ export default class WireUpComponentsInto {
   }
 
   registerQueriesInto(registry) {
-    for (var query in queries) {
+    for (let query in queries) {
       console.log(`registering: ${query}`);
       registry.register('query', (container) => {
         return new queries[query](container.resolve('eventAggregator'));
diff --git a/app/screens/login-screen.js b/app/screens/login-screen.js
index 9b6bcc3..644bd57 100644
--- a/app/screens/login-screen.js
+++ b/app/screens/login-screen.js
@@ -5,6 +5,7 @@ import Account from '../domain/account'
 import Api from '../infrastructure/api'
 import DashboardScreen from './dashboard-screen'
 import ApplicationComponent from '../components/application-component'
+import * as events from '../services/events';
 
 var t = require('tcomb-form-native');
 var Form = t.form.Form;
@@ -14,13 +15,13 @@ export default class LoginScreen extends ApplicationComponent {
     super(props)
     this.state = {
       account: { username: 'mokha', password: 'password' },
-      eventsOfInterest: ['LOGGED_IN'],
+      eventsOfInterest: [events.LOGGED_IN],
     };
   }
 
   componentDidMount() {
     super.componentDidMount();
-    this.notify({username: 'mokha', gravatar_id: '96c04b963c1ab66002bf3455900a2680' }); // TODO:: REMOVE
+    //this.notify({username: 'mokha', gravatar_id: '96c04b963c1ab66002bf3455900a2680' }); // TODO:: REMOVE
   }
 
   render() {
@@ -61,12 +62,12 @@ export default class LoginScreen extends ApplicationComponent {
 
   onLogin() {
     let account = this.refs.form.getValue();
-    this.setState({isLoading: true});
     this.publish({
-      event: 'LOGIN',
+      event: events.LOGIN,
       username: account.username,
       password: account.password
     });
+    this.setState({isLoading: true});
   }
 
   onChange(account) {