JC Brand 11 lat temu
rodzic
commit
eb7749e6ca

+ 1 - 1
Makefile

@@ -2,7 +2,7 @@
 BOWER 		?= node_modules/.bin/bower
 BOWER 		?= node_modules/.bin/bower
 BUILDDIR     = ./docs
 BUILDDIR     = ./docs
 PAPER        =
 PAPER        =
-PHANTOMJS	?= phantomjs
+PHANTOMJS	?= node_modules/.bin/phantomjs
 SPHINXBUILD  = sphinx-build
 SPHINXBUILD  = sphinx-build
 SPHINXOPTS   =
 SPHINXOPTS   =
 
 

Plik diff jest za duży
+ 0 - 0
builds/converse-no-locales-no-otr.min.js


Plik diff jest za duży
+ 0 - 0
builds/converse-no-otr.min.js


Plik diff jest za duży
+ 0 - 0
builds/converse.min.js


Plik diff jest za duży
+ 0 - 0
builds/converse.website-no-otr.min.js


Plik diff jest za duży
+ 0 - 0
builds/converse.website.min.js


Plik diff jest za duży
+ 0 - 0
css/converse.min.css


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

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików