Check for lightdm in window and if languages is an object

Addresses issue FallingSnow#2
cytodev · Mar 1, 2017 · bf231dd · bf231dd
1 parent 0b48c89
commit bf231dd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -8,7 +8,7 @@ import injectTapEventPlugin from 'react-tap-event-plugin';
 injectTapEventPlugin();
 
 // Load mock if in development mode
-if (!lightdm && process.env.NODE_ENV === 'development') {
+if (!(lightdm in window) && process.env.NODE_ENV === 'development') {
     const LightDMMock = require("../LightDMMock/mock/LightDMMock.js");
     // const LightDMMock = require("../LightDMMock/src/LightDMMock.js");
     window.lightdm = new LightDMMock(true, 0, false);
@@ -46,15 +46,15 @@ if (!lightdm && process.env.NODE_ENV === 'development') {
     }
 }
 
-if (!lightdm || !lightdm.languages) {
+if (!(lightdm in window) || !(typeof lightdm.languages === "object")) {
     const timeout = setTimeout(() => {
         clearInterval(interval);
         document.body.innerHTML += '<h1 style="background-color: white; color: red;">Lightdm did not load</h1>';
         throw new Error('lightdm did not load in time');
     }, 1000);
     const interval = setInterval(() => {
 
-        if (lightdm && lightdm.languages) {
+        if (lightdm in window && typeof lightdm.languages === "object") {
             clearInterval(interval);
             clearTimeout(timeout);
             return init();