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

Merge pull request #124 from fouksf/hide-filmstrip 

Fixes bug with no audio when film strip is hidden.
This commit is contained in:
hristoterezov 2014-09-08 18:58:37 +03:00
parent ba8606df80 7800487553
commit a28c785995
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bottom_toolbar.js
View File

@ -22,7 +22,8 @@ var BottomToolbar = (function (my) {
}; };
my.toggleFilmStrip = function() { my.toggleFilmStrip = function() {
$("#remoteVideos").toggle("slide", { direction: "down", duration: 700}); var filmstrip = $("#remoteVideos");
filmstrip.toggleClass("hidden");
}; };

5
css/videolayout_default.css
View File

@ -19,6 +19,11 @@
width:auto; width:auto;
border:1px solid transparent; border:1px solid transparent;
z-index: 5; z-index: 5;
transition: bottom 2s;
}
#remotevideos.hidden {
bottom: -196px;
} }
.videocontainer { .videocontainer {

2
index.html
View File

@ -53,7 +53,7 @@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="css/font.css?v=4"/> <link rel="stylesheet" href="css/font.css?v=4"/>
<link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=23"/> <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=23"/>
<link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=9" id="videolayout_default"/> <link rel="stylesheet" type="text/css" media="screen" href="css/videolayout_default.css?v=10" id="videolayout_default"/>
<link rel="stylesheet" href="css/jquery-impromptu.css?v=4"> <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
<link rel="stylesheet" href="css/modaldialog.css?v=3"> <link rel="stylesheet" href="css/modaldialog.css?v=3">
<link rel="stylesheet" href="css/popup_menu.css?v=2"> <link rel="stylesheet" href="css/popup_menu.css?v=2">