haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
turint 2014-08-29 17:48:13 +03:00
parent c44ffdb678 d148161a42
commit 26413a6ae9
9 changed files with 9220 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@ -190,10 +190,11 @@ function doJoin() {
if (path.length > 1) {
roomnode = path.substr(1).toLowerCase();
} else {
roomnode = RoomNameGenerator.generateRoomWithoutSeparator(3);
var word = RoomNameGenerator.generateRoomWithoutSeparator(3);
roomnode = word.toLowerCase();
window.history.pushState('VideoChat',
'Room: ' + roomnode, window.location.pathname + roomnode);
'Room: ' + word, window.location.pathname + word);
}
}

18
debian/jitsi-meet-prosody.postinst vendored
View File

@ -23,12 +23,20 @@ case "$1" in
. /etc/default/jitsi-videobridge
if [ -f /etc/prosody/prosody.cfg.lua ]; then
mv /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig
PROSODY_CONFIG_PRESENT="true"
if [ ! -f /etc/prosody/prosody.cfg.lua ]; then
PROSODY_CONFIG_PRESENT="false"
gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
fi
gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" /etc/prosody/prosody.cfg.lua
sed -i "s/jitmeetSecret/$JVB_SECRET/g" /etc/prosody/prosody.cfg.lua
if [ ! grep "VirtualHost \"$JVB_HOSTNAME\"" /etc/prosody/prosody.cfg.lua > /dev/null ]; then
if [ "PROSODY_CONFIG_PRESENT" = "true" ]; then
mv /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig
fi
sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" /etc/prosody/prosody.cfg.lua
sed -i "s/jitmeetSecret/$JVB_SECRET/g" /etc/prosody/prosody.cfg.lua
fi
if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
HOST="$( (hostname -s; echo localhost) | head -n 1)"
DOMAIN="$( (hostname -d; echo localdomain) | head -n 1)"

6
debian/jitsi-meet.postinst vendored
View File

@ -39,9 +39,9 @@ case "$1" in
chown -R www-data:www-data /usr/share/jitsi-meet/
sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /usr/share/jitsi-meet/config.js
# enable turn
if grep "// useStunTurn: true," /usr/share/jitsi-meet/config.js > /dev/null; then
sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /usr/share/jitsi-meet/config.js
fi
#if grep "// useStunTurn: true," /usr/share/jitsi-meet/config.js > /dev/null; then
# sed -i "s/\/\/\ \ useStunTurn:\ true,/\ \ \ \ useStunTurn:\ true,/" /usr/share/jitsi-meet/config.js
#fi
invoke-rc.d nginx restart
;;

4
index.html
View File

@ -9,7 +9,7 @@
<meta itemprop="name" content="Jitsi Meet"/>
<meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
<meta itemprop="image" content="/images/jitsilogo.png"/>
<script src="libs/jquery.min.js"></script>
<script src="libs/jquery-2.1.1.min.js"></script>
<script src="libs/strophe/strophe.jingle.adapter.js?v=1"></script><!-- strophe.jingle bundles -->
<script src="libs/strophe/strophe.jingle.bundle.js?v=8"></script>
<script src="libs/strophe/strophe.jingle.js?v=1"></script>
@ -207,7 +207,7 @@
<div class="header_button_separator"></div>
<span id="hangup">
<a class="button" data-toggle="popover" data-placement="bottom" data-content="Hang Up" onclick='hangup();'>
<i class="icon-hangup" style="color:#f42a24;"></i>
<i class="icon-hangup" style="color:#ff0000;font-size: 1.4em;"></i>
</a>
</span>
</span>

9190
libs/jquery-2.1.1.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

4
libs/jquery-2.1.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
libs/jquery-2.1.1.min.map Normal file
View File

File diff suppressed because one or more lines are too long

6
libs/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
libs/strophe/strophe.jingle.js
View File

@ -253,7 +253,8 @@ Strophe.addConnectionPlugin('jingle', {
$(res).find('>services>service').each(function (idx, el) {
el = $(el);
var dict = {};
switch (el.attr('type')) {
var type = el.attr('type');
switch (type) {
case 'stun':
dict.url = 'stun:' + el.attr('host');
if (el.attr('port')) {
@ -262,7 +263,8 @@ Strophe.addConnectionPlugin('jingle', {
iceservers.push(dict);
break;
case 'turn':
dict.url = 'turn:';
case 'turns':
dict.url = type + ':';
if (el.attr('username')) { // https://code.google.com/p/webrtc/issues/detail?id=1508
if (navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./) && parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2], 10) < 28) {
dict.url += el.attr('username') + '@';