Browse Source

Make sure main.js is loaded before calling require.

When calling require from within HTML, then don't use data-main, but instead
load main.js via a require call.

See here: http://requirejs.org/docs/api.html#data-main
JC Brand 11 years ago
parent
commit
0a1614741b
1 changed files with 17 additions and 14 deletions
  1. 17 14
      index.html

+ 17 - 14
index.html

@@ -12,7 +12,7 @@
     <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-    <script data-main="main" src="components/requirejs/require.js"></script>
+    <script src="components/requirejs/require.js"></script>
 </head>
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
@@ -224,19 +224,22 @@
 <script type="text/javascript">try { var pageTracker = _gat._getTracker("UA-2128260-8"); pageTracker._trackPageview(); } catch(err) {}</script>
 
 <script>
-    require(['converse'], function (converse) {
-        converse.initialize({
-            allow_otr: true,
-            auto_list_rooms: false,
-            auto_subscribe: false,
-            bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
-            hide_muc_server: false,
-            i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
-            play_sounds: true,
-            prebind: false,
-            show_controlbox_by_default: true,
-            debug: true,
-            roster_groups: true
+    require(['main.js'], function () {
+        // Configuration loaded, so safe to make other require calls.
+        require(['converse'], function (converse) {
+            converse.initialize({
+                allow_otr: true,
+                auto_list_rooms: false,
+                auto_subscribe: false,
+                bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
+                hide_muc_server: false,
+                i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
+                play_sounds: true,
+                prebind: false,
+                show_controlbox_by_default: true,
+                debug: true,
+                roster_groups: true
+            });
         });
     });
 </script>