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

Merge pull request #591 from jitsi/fix-black-stripe 

Fix black stripe and side panel animations
This commit is contained in:
damencho 2016-04-06 16:15:22 -05:00
parent 8842823607 4990406010
commit a112b10a36
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/main.css
View File

@ -20,7 +20,7 @@ html, body{
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
right: 0px; right: 0px;
width: 20%; width: 0px;
max-width: 200px; max-width: 200px;
overflow: hidden; overflow: hidden;
/* background-color:#dfebf1;*/ /* background-color:#dfebf1;*/

23
modules/UI/side_pannels/SidePanelToggler.js
View File

@ -38,13 +38,18 @@ function toggle (object, selector, onOpenComplete,
queue: false, queue: false,
duration: 500 duration: 500
}); });
$(selector).hide("slide", { $(selector).hide("slide", {
direction: "right", direction: "right",
queue: false, queue: false,
duration: 500 duration: 500,
// Set the size to 0 at the end of the animation to ensure that
// the is(":visible") function on this selector will return {false}
// when the element is hidden.
complete: function() {$(selector).css("width", "0");}
}); });
resizeVideoArea(isSideBarVisible, onVideoResizeComplete); resizeVideoArea(false, onVideoResizeComplete);
if(typeof onClose === "function") { if(typeof onClose === "function") {
onClose(); onClose();
@ -52,7 +57,7 @@ function toggle (object, selector, onOpenComplete,
currentlyOpen = null; currentlyOpen = null;
} else { } else {
resizeVideoArea(isSideBarVisible, onVideoResizeComplete); resizeVideoArea(true, onVideoResizeComplete);
// Undock the toolbar when the chat is shown and if we're in a // Undock the toolbar when the chat is shown and if we're in a
// video mode. // video mode.
@ -76,6 +81,12 @@ function toggle (object, selector, onOpenComplete,
queue: false, queue: false,
duration: 500 duration: 500
}); });
// Set the size dynamically (not in the css), so that we're sure that
// when is(":visible") is called on this selector the result is {false}
// before it's actually visible.
// (Chrome seems to return {true} for an element which is in the DOM and
// has non-null size set).
$(selector).css("width", "20%");
$(selector).show("slide", { $(selector).show("slide", {
direction: "right", direction: "right",
queue: false, queue: false,
@ -91,9 +102,9 @@ function toggle (object, selector, onOpenComplete,
} }
function resizeVideoArea(isSidePanelVisible, completeFunction) { function resizeVideoArea(isSidePanelVisible, completeFunction) {
VideoLayout.resizeVideoArea(!isSidePanelVisible, VideoLayout.resizeVideoArea(isSidePanelVisible,
false, false,//don't force thumbnail count update
false, true, //animate
completeFunction); completeFunction);
} }