diff --git a/browser/main/Components/CodeEditor.jsx b/browser/main/Components/CodeEditor.jsx index 16054576..9bb02bf1 100644 --- a/browser/main/Components/CodeEditor.jsx +++ b/browser/main/Components/CodeEditor.jsx @@ -1,6 +1,6 @@ var React = require('react/addons') -var ace = require('ace') +var ace = window.ace var CodeEditor = React.createClass({ propTypes: { code: React.PropTypes.string, diff --git a/browser/main/Components/CodeViewer.jsx b/browser/main/Components/CodeViewer.jsx index 7f3319bc..09e04229 100644 --- a/browser/main/Components/CodeViewer.jsx +++ b/browser/main/Components/CodeViewer.jsx @@ -1,6 +1,6 @@ var React = require('react/addons') -var ace = require('ace') +var ace = window.ace var CodeViewer = React.createClass({ propTypes: { code: React.PropTypes.string, diff --git a/browser/main/Containers/MainContainer.jsx b/browser/main/Containers/MainContainer.jsx index 95fd0bea..76175980 100644 --- a/browser/main/Containers/MainContainer.jsx +++ b/browser/main/Containers/MainContainer.jsx @@ -13,6 +13,10 @@ module.exports = React.createClass({ this.unsubscribe() }, onListen: function (res) { + if (res == null || res.status == null) { + return + } + if (res.status === 'loggedIn' || res.status === 'registered') { var user = res.data var planet = user.Planets.length > 0 ? user.Planets[0] : null diff --git a/browser/main/index.electron.html b/browser/main/index.electron.html index 0b416d2a..a47dc8a7 100644 --- a/browser/main/index.electron.html +++ b/browser/main/index.electron.html @@ -4,12 +4,48 @@