From fa305639376c82df72c80ba83c10714df7565af4 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Thu, 30 Apr 2020 13:27:01 +0200
Subject: [PATCH] Don't assume that window.converse is always defined

---
 src/converse-emoji-views.js   | 5 +++--
 src/headless/converse-core.js | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/converse-emoji-views.js b/src/converse-emoji-views.js
index 9b2fb7e3d..751185545 100644
--- a/src/converse-emoji-views.js
+++ b/src/converse-emoji-views.js
@@ -4,13 +4,14 @@
  * @license Mozilla Public License (MPLv2)
  */
 import "@converse/headless/converse-emoji";
-import { View } from "skeletor.js/src/view";
-import { debounce, find } from "lodash";
 import DOMNavigator from "./dom-navigator";
 import bootstrap from "bootstrap.native";
 import emoji_picker from "templates/emoji_picker.js";
 import sizzle from 'sizzle';
 import tpl_emoji_button from "templates/emoji_button.html";
+import { View } from "skeletor.js/src/view";
+import { converse } from '@converse/headless/converse-core';
+import { debounce, find } from "lodash";
 
 const u = converse.env.utils;
 
diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js
index e6915c1a7..39905c98b 100644
--- a/src/headless/converse-core.js
+++ b/src/headless/converse-core.js
@@ -1737,7 +1737,7 @@ function setUnloadEvent () {
     }
 }
 
-export const converse = window.converse;
+export const converse = window.converse || {};
 
 
 /**
@@ -1912,4 +1912,6 @@ Object.assign(converse, {
  * @event converse-loaded
  * @example window.addEventListener('converse-loaded', () => converse.initialize());
  */
-window.dispatchEvent(new CustomEvent('converse-loaded'));
+const ev = new CustomEvent('converse-loaded')
+ev.converse = converse;
+window.dispatchEvent(ev);