From bf231dd22b1b203e2788518b2d95771525236f29 Mon Sep 17 00:00:00 2001
From: Roel Walraven <mail@cytodev.io>
Date: Wed, 1 Mar 2017 09:05:54 +0100
Subject: [PATCH 1/2] Check for lightdm in window and if languages is an object

Addresses issue #2
---
 src/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/index.js b/src/index.js
index c11d4e7..de35275 100755
--- 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,7 +46,7 @@ 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>';
@@ -54,7 +54,7 @@ if (!lightdm || !lightdm.languages) {
     }, 1000);
     const interval = setInterval(() => {
 
-        if (lightdm && lightdm.languages) {
+        if (lightdm in window && typeof lightdm.languages === "object") {
             clearInterval(interval);
             clearTimeout(timeout);
             return init();

From 6629f3506e02ce6d29973643c91d07754866d4e2 Mon Sep 17 00:00:00 2001
From: Roel Walraven <mail@cytodev.io>
Date: Sat, 3 Jun 2017 17:04:58 +0200
Subject: [PATCH 2/2] Change lightdm to string

Thanks francoiscote
---
 src/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/index.js b/src/index.js
index de35275..0d72a4e 100755
--- 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 in window) && 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,7 +46,7 @@ if (!(lightdm in window) && process.env.NODE_ENV === 'development') {
     }
 }
 
-if (!(lightdm in window) || !(typeof lightdm.languages === "object")) {
+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>';
@@ -54,7 +54,7 @@ if (!(lightdm in window) || !(typeof lightdm.languages === "object")) {
     }, 1000);
     const interval = setInterval(() => {
 
-        if (lightdm in window && typeof lightdm.languages === "object") {
+        if ("lightdm" in window && typeof lightdm.languages === "object") {
             clearInterval(interval);
             clearTimeout(timeout);
             return init();