ES6 SessionStore

src/components/structures/MatrixChat.js

@@ -40,7 +40,7 @@ var PageTypes = require('../../PageTypes');
 var createRoom = require("../../createRoom");
 import * as UDEHandler from '../../UnknownDeviceErrorHandler';
 
-import getSessionStore from '../../stores/SessionStore';
+import sessionStore from '../../stores/SessionStore';
 
 module.exports = React.createClass({
     displayName: 'MatrixChat',
@@ -251,7 +251,7 @@ module.exports = React.createClass({
             });
         }
 
-        this._sessionStore = getSessionStore();
+        this._sessionStore = sessionStore;
         this._sessionStore.on('update', this._setStateFromSessionStore);
         this._setStateFromSessionStore();
     },

src/components/views/settings/ChangePassword.js

@@ -22,7 +22,7 @@ var Modal = require("../../../Modal");
 var sdk = require("../../../index");
 import AccessibleButton from '../elements/AccessibleButton';
 
-import getSessionStore from '../../../stores/SessionStore';
+import sessionStore from '../../../stores/SessionStore';
 
 module.exports = React.createClass({
     displayName: 'ChangePassword',
@@ -68,7 +68,7 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        this.sessionStore = getSessionStore();
+        this.sessionStore = sessionStore;
         this.sessionStore.on('update', this.setStateFromSessionStore);
 
         this.setStateFromSessionStore();

src/stores/SessionStore.js

@@ -6,7 +6,10 @@ import EventEmitter from 'events';
  * store that listens for actions and updates its state accordingly, informing any
  * listeners (views) of state changes via the 'update' event.
  */
-function SessionStore() {
+class SessionStore extends EventEmitter {
+    constructor() {
+        super();
+
         // Initialise state
         this._state = {
             cachedPassword: localStorage.getItem('mx_pass'),
@@ -15,10 +18,7 @@ function SessionStore() {
         dis.register(this._onAction.bind(this));
     }
 
-// Inherit from EventEmitter
-SessionStore.prototype = EventEmitter.prototype;
-
-SessionStore.prototype._update = function() {
+    _update() {
         // Persist state to localStorage
         if (this._state.cachedPassword) {
             localStorage.setItem('mx_pass', this._state.cachedPassword);
@@ -27,14 +27,14 @@ SessionStore.prototype._update = function() {
         }
 
         this.emit('update');
-};
+    }
 
-SessionStore.prototype._setState = function(newState) {
+    _setState(newState) {
         this._state = Object.assign(this._state, newState);
         this._update();
-};
+    }
 
-SessionStore.prototype._onAction = function(payload) {
+    _onAction(payload) {
         switch (payload.action) {
             case 'cached_password':
                 this._setState({
@@ -47,11 +47,12 @@ SessionStore.prototype._onAction = function(payload) {
                 });
                 break;
         }
-};
+    }
 
-SessionStore.prototype.getCachedPassword = function() {
+    getCachedPassword() {
         return this._state.cachedPassword;
-};
+    }
+}
 
 // Export singleton getter
 let singletonSessionStore = null;