abort on login/flow and if dependency fails (fix jsxc/jsxc#584)

1 files changed, 6 insertions, 1 deletions

diff --git a/js/ojsxc.js b/js/ojsxc.js
index 0253f8c..d95defb 100644
--- a/js/ojsxc.js
+++ b/js/ojsxc.js
@@ -294,11 +294,16 @@
             return;
         }
 
-        if (typeof jsxc === 'undefined') {
+        if (typeof jsxc === 'undefined' || typeof emojione === 'undefined') {
             // abort if core or dependencies threw an error
             return;
         }
 
+        if (OC.generateUrl('login/flow') === window.location.pathname) {
+           // abort on login flow
+           return;
+        }
+
         $(document).one('ready-roster-jsxc', onRosterReady);
         $(document).on('toggle.roster.jsxc', onRosterToggle);