diff options
author | enahum <nahumhbl@gmail.com> | 2016-05-27 13:53:31 -0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-05-27 12:53:31 -0400 |
commit | 40743af734e438a97f946476552ccda2a5b0dbcf (patch) | |
tree | 63e25e4a6f0b2523d082c79ea442c641e93e367d /webapp/components | |
parent | ac509b114df1c1b4b841eded74fb797805e0162d (diff) | |
download | chat-40743af734e438a97f946476552ccda2a5b0dbcf.tar.gz chat-40743af734e438a97f946476552ccda2a5b0dbcf.tar.bz2 chat-40743af734e438a97f946476552ccda2a5b0dbcf.zip |
PLT-3030 Fix Blank Page (#3104)
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/login/login.jsx | 1 | ||||
-rw-r--r-- | webapp/components/root.jsx | 33 |
2 files changed, 18 insertions, 16 deletions
diff --git a/webapp/components/login/login.jsx b/webapp/components/login/login.jsx index 8ae3fdd4d..e0969001a 100644 --- a/webapp/components/login/login.jsx +++ b/webapp/components/login/login.jsx @@ -115,6 +115,7 @@ export default class Login extends React.Component { finishSignin() { GlobalActions.emitInitialLoad( () => { + GlobalActions.loadBrowserLocale(); browserHistory.push('/select_team'); } ); diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx index 0adbc7f04..6a5af75c6 100644 --- a/webapp/components/root.jsx +++ b/webapp/components/root.jsx @@ -26,6 +26,19 @@ export default class Root extends React.Component { this.localizationChanged = this.localizationChanged.bind(this); this.redirectIfNecessary = this.redirectIfNecessary.bind(this); + + // Ya.... + /*eslint-disable */ + if (window.mm_config.SegmentDeveloperKey != null && window.mm_config.SegmentDeveloperKey !== "") { + !function(){var analytics=global.window.analytics=global.window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; + analytics.load(window.mm_config.SegmentDeveloperKey); + analytics.page(); + }}(); + } + /*eslint-enable */ + + // Fastclick + FastClick.attach(document.body); } localizationChanged() { this.setState({locale: LocalizationStore.getLocale(), translations: LocalizationStore.getTranslations()}); @@ -46,27 +59,15 @@ export default class Root extends React.Component { this.redirectIfNecessary(newProps); } componentWillMount() { + // Redirect if Necessary + this.redirectIfNecessary(this.props); + } + componentDidMount() { // Setup localization listener LocalizationStore.addChangeListener(this.localizationChanged); - // Ya.... - /*eslint-disable */ - if (window.mm_config.SegmentDeveloperKey != null && window.mm_config.SegmentDeveloperKey !== "") { - !function(){var analytics=global.window.analytics=global.window.analytics||[];if(!analytics.initialize)if(analytics.invoked)window.console&&console.error&&console.error("Segment snippet included twice.");else{analytics.invoked=!0;analytics.methods=["trackSubmit","trackClick","trackLink","trackForm","pageview","identify","group","track","ready","alias","page","once","off","on"];analytics.factory=function(t){return function(){var e=Array.prototype.slice.call(arguments);e.unshift(t);analytics.push(e);return analytics}};for(var t=0;t<analytics.methods.length;t++){var e=analytics.methods[t];analytics[e]=analytics.factory(e)}analytics.load=function(t){var e=document.createElement("script");e.type="text/javascript";e.async=!0;e.src=("https:"===document.location.protocol?"https://":"http://")+"cdn.segment.com/analytics.js/v1/"+t+"/analytics.min.js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(e,n)};analytics.SNIPPET_VERSION="3.0.1"; - analytics.load(window.mm_config.SegmentDeveloperKey); - analytics.page(); - }}(); - } - /*eslint-enable */ - - // Fastclick - FastClick.attach(document.body); - // Get our localizaiton GlobalActions.loadBrowserLocale(); - - // Redirect if Necessary - this.redirectIfNecessary(this.props); } componentWillUnmount() { LocalizationStore.removeChangeListener(this.localizationChanged); |