summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-06-19 19:22:11 +0300
committerAndrej Mihajlov <and@codeispoetry.ru>2017-06-22 12:59:07 +0300
commit22357390126fb76407a7664b14d7678027d64690 (patch)
tree1c8783dd6add290c28a06d68ae8ad2307d3cd227
parent60f7019f692cc01706104c5bd8e4ec427ffdd185 (diff)
downloadmullvadvpn-22357390126fb76407a7664b14d7678027d64690.tar.xz
mullvadvpn-22357390126fb76407a7664b14d7678027d64690.zip
Fix rendering code to be Flow proof
-rw-r--r--app/app.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/app/app.js b/app/app.js
index 40440efa3b..c3d5acbcb8 100644
--- a/app/app.js
+++ b/app/app.js
@@ -75,8 +75,6 @@ backend.on('disconnect', updateTrayIcon);
// force update tray
updateTrayIcon();
-const rootElement = document.querySelector(document.currentScript.getAttribute('data-container'));
-
// disable smart pinch.
webFrame.setZoomLevelLimits(1, 1);
@@ -91,6 +89,16 @@ if(navigator.serviceWorker) {
ipcRenderer.send('on-browser-window-ready');
+const containerId = document.currentScript.getAttribute('data-container');
+if(!containerId) {
+ throw new Error('Missing data-container attribute.');
+}
+
+const rootElement = document.querySelector(containerId);
+if(!rootElement) {
+ throw new Error('Missing root element.');
+}
+
ReactDOM.render(
<Provider store={ store }>
<ConnectedRouter history={ memoryHistory }>
@@ -98,4 +106,4 @@ ReactDOM.render(
</ConnectedRouter>
</Provider>,
rootElement
-);
+); \ No newline at end of file