1 files changed, 29 insertions, 13 deletions

diff --git a/webapp/root.jsx b/webapp/root.jsx
index 2ce220f1d..63fbb4422 100644
--- a/webapp/root.jsx
+++ b/webapp/root.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 import $ from 'jquery';
+require('perfect-scrollbar/jquery')($);
 
 import 'bootstrap/dist/css/bootstrap.css';
 import 'jasny-bootstrap/dist/css/jasny-bootstrap.css';
@@ -24,11 +25,11 @@ import Sidebar from 'components/sidebar.jsx';
 import * as AsyncClient from 'utils/async_client.jsx';
 import PreferenceStore from 'stores/preference_store.jsx';
 import ChannelStore from 'stores/channel_store.jsx';
-import SocketStore from 'stores/socket_store.jsx';
 import ErrorStore from 'stores/error_store.jsx';
 import BrowserStore from 'stores/browser_store.jsx';
 import SignupTeam from 'components/signup_team.jsx';
 import * as Client from 'utils/client.jsx';
+import * as Websockets from 'action_creators/websocket_actions.jsx';
 import * as GlobalActions from 'action_creators/global_actions.jsx';
 import SignupTeamConfirm from 'components/signup_team_confirm.jsx';
 import SignupUserComplete from 'components/signup_user_complete.jsx';
@@ -101,29 +102,43 @@ function preRenderSetup(callwhendone) {
         // Do Nothing
     };
 
+    // Make sure the websockets close
     $(window).on('beforeunload',
          () => {
-             if (window.SocketStore) {
-                 SocketStore.close();
-             }
+             Websockets.close();
          }
     );
 
-    addLocaleData(enLocaleData);
-    addLocaleData(esLocaleData);
-    addLocaleData(ptLocaleData);
+    function afterIntl() {
+        addLocaleData(enLocaleData);
+        addLocaleData(esLocaleData);
+        addLocaleData(ptLocaleData);
 
-    $.when(d1, d2).done(callwhendone);
+        $.when(d1, d2).done(callwhendone);
+    }
+
+    if (global.Intl) {
+        afterIntl();
+    } else {
+        require.ensure([
+            'intl',
+            'intl/locale-data/jsonp/en.js',
+            'intl/locale-data/jsonp/es.js',
+            'intl/locale-data/jsonp/pt.js'
+        ], (require) => {
+            require('intl');
+            require('intl/locale-data/jsonp/en.js');
+            require('intl/locale-data/jsonp/es.js');
+            require('intl/locale-data/jsonp/pt.js');
+            afterIntl();
+        });
+    }
 }
 
 function preLoggedIn(nextState, replace, callback) {
     const d1 = Client.getAllPreferences(
         (data) => {
-            if (!data) {
-                return;
-            }
-
-            PreferenceStore.setPreferences(data);
+            PreferenceStore.setPreferencesFromServer(data);
         },
         (err) => {
             AsyncClient.dispatchError(err, 'getAllPreferences');
@@ -179,6 +194,7 @@ function onLoggedOut(nextState) {
             BrowserStore.signalLogout();
             BrowserStore.clear();
             ErrorStore.clearLastError();
+            PreferenceStore.clear();
         },
         () => {
             browserHistory.push('/' + teamName + '/login');