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

Merge pull request #134 from fouksf/bottom-toolbar-fix 

Fixes the bottom toolbar not hiding with the header toolbar.
This commit is contained in:
bgrozev 2014-09-18 10:17:10 +03:00
parent 360829c092 6e191f4023
commit 97f9a40cfa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolbar_toggler.js
View File

@ -13,7 +13,7 @@ var ToolbarToggler = (function(my) {
header.show("slide", { direction: "up", duration: 300}); header.show("slide", { direction: "up", duration: 300});
$('#subject').animate({top: "+=40"}, 300); $('#subject').animate({top: "+=40"}, 300);
if(!bottomToolbar.is(":visible")) { if(!bottomToolbar.is(":visible")) {
bottomToolbar.show("slide", {direction: "right",cduration: 300}); bottomToolbar.show("slide", {direction: "right",duration: 300});
} }
if (toolbarTimeout) { if (toolbarTimeout) {
@ -57,8 +57,8 @@ var ToolbarToggler = (function(my) {
if (!isToolbarHover) { if (!isToolbarHover) {
header.hide("slide", { direction: "up", duration: 300}); header.hide("slide", { direction: "up", duration: 300});
$('#subject').animate({top: "-=40"}, 300); $('#subject').animate({top: "-=40"}, 300);
if(!$("#remoteVideos").is(":visible")) { if($("#remoteVideos").hasClass("hidden")) {
bottomToolbar.hide("slide", {direction: "right", cduration: 300}); bottomToolbar.hide("slide", {direction: "right", duration: 300});
} }
} }
else { else {