From 536724e7c5b6f55352311ad2856e95ece60ab5cb Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 12 May 2017 15:58:44 +0100
Subject: [PATCH] ES6 SessionStore

---
 src/components/structures/MatrixChat.js       |  4 +-
 .../views/settings/ChangePassword.js          |  4 +-
 src/stores/SessionStore.js                    | 89 ++++++++++---------
 3 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5975d6cf5f..b8b3f51422 100644
--- a/src/components/structures/MatrixChat.js
+++ b/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();
     },
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 3a1c777cd9..c20bc47152 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/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();
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index 7be3885fde..bf605d7f07 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -6,53 +6,54 @@ 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() {
-    // Initialise state
-    this._state = {
-        cachedPassword: localStorage.getItem('mx_pass'),
-    };
+class SessionStore extends EventEmitter {
+    constructor() {
+        super();
 
-    dis.register(this._onAction.bind(this));
+        // Initialise state
+        this._state = {
+            cachedPassword: localStorage.getItem('mx_pass'),
+        };
+
+        dis.register(this._onAction.bind(this));
+    }
+
+    _update() {
+        // Persist state to localStorage
+        if (this._state.cachedPassword) {
+            localStorage.setItem('mx_pass', this._state.cachedPassword);
+        } else {
+            localStorage.removeItem('mx_pass', this._state.cachedPassword);
+        }
+
+        this.emit('update');
+    }
+
+    _setState(newState) {
+        this._state = Object.assign(this._state, newState);
+        this._update();
+    }
+
+    _onAction(payload) {
+        switch (payload.action) {
+            case 'cached_password':
+                this._setState({
+                    cachedPassword: payload.cachedPassword,
+                });
+                break;
+            case 'password_changed':
+                this._setState({
+                    cachedPassword: null,
+                });
+                break;
+        }
+    }
+
+    getCachedPassword() {
+        return this._state.cachedPassword;
+    }
 }
 
-// Inherit from EventEmitter
-SessionStore.prototype = EventEmitter.prototype;
-
-SessionStore.prototype._update = function() {
-    // Persist state to localStorage
-    if (this._state.cachedPassword) {
-        localStorage.setItem('mx_pass', this._state.cachedPassword);
-    } else {
-        localStorage.removeItem('mx_pass', this._state.cachedPassword);
-    }
-
-    this.emit('update');
-};
-
-SessionStore.prototype._setState = function(newState) {
-    this._state = Object.assign(this._state, newState);
-    this._update();
-};
-
-SessionStore.prototype._onAction = function(payload) {
-    switch (payload.action) {
-        case 'cached_password':
-            this._setState({
-                cachedPassword: payload.cachedPassword,
-            });
-            break;
-        case 'password_changed':
-            this._setState({
-                cachedPassword: null,
-            });
-            break;
-    }
-};
-
-SessionStore.prototype.getCachedPassword = function() {
-    return this._state.cachedPassword;
-};
-
 // Export singleton getter
 let singletonSessionStore = null;
 if (!singletonSessionStore) {