Rebuild.

eb7749e6 · JC Brand · 882bbcb0 · eb7749e6 · eb7749e6 · eb7749e6
Commit eb7749e6 authored Aug 20, 2014 by JC Brand
8 changed files
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 BOWER 		?= node_modules/.bin/bower
 BUILDDIR     = ./docs
 PAPER        =
-PHANTOMJS	?= phantomjs
+PHANTOMJS	?= node_modules/.bin/phantomjs
 SPHINXBUILD  = sphinx-build
 SPHINXOPTS   =


--- a/builds/converse-no-locales-no-otr.min.js
+++ b/builds/converse-no-locales-no-otr.min.js
--- a/builds/converse-no-otr.min.js
+++ b/builds/converse-no-otr.min.js
--- a/builds/converse.min.js
+++ b/builds/converse.min.js
--- a/builds/converse.website-no-otr.min.js
+++ b/builds/converse.website-no-otr.min.js
--- a/builds/converse.website.min.js
+++ b/builds/converse.website.min.js
--- a/css/converse.min.css
+++ b/css/converse.min.css
--- a/index.html
+++ b/index.html
@@ -11,8 +11,14 @@
    <link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" />
    <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>
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
+    <!-- Only for development: <script data-main="main" src="components/requirejs/require.js"></script> -->
+    <![if gte IE 9]>
+        <script src="builds/converse.website.min.js"></script>
+    <![endif]>
+    <!--[if lt IE 9]>
+        <script src="builds/converse.website-no-otr.min.js"></script>
+    <![endif]-->
 </head>

 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
@@ -224,7 +230,7 @@
 <script>
    require(['converse'], function (converse) {
        converse.initialize({
-            auto_reconnect: false,  // This feature still seems buggy
+            auto_reconnect: false, // Still buggy
            allow_otr: true,
            auto_list_rooms: false,
            auto_subscribe: false,
@@ -232,8 +238,8 @@
            debug: true ,
            hide_muc_server: false,
            i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported
-            prebind: false,
            play_sounds: true,
+            prebind: false,
            show_controlbox_by_default: true,
            xhr_user_search: false,
            roster_groups: true