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

Merge pull request #882 from jitsi/fix-hide-toolbar 

Fixes hiding toolbar.
This commit is contained in:
yanas 2016-09-15 15:10:54 -05:00 committed by GitHub
parent 9b25467080 c483587853
commit b6e18d8a68
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/UI/side_pannels/chat/Chat.js
View File

@ -3,6 +3,7 @@
import {processReplacements, linkify} from './Replacement'; import {processReplacements, linkify} from './Replacement';
import CommandsProcessor from './Commands'; import CommandsProcessor from './Commands';
import ToolbarToggler from '../../toolbars/ToolbarToggler'; import ToolbarToggler from '../../toolbars/ToolbarToggler';
import VideoLayout from "../../videolayout/VideoLayout";
import UIUtil from '../../util/UIUtil'; import UIUtil from '../../util/UIUtil';
import UIEvents from '../../../../service/UI/UIEvents'; import UIEvents from '../../../../service/UI/UIEvents';
@ -180,6 +181,12 @@ var Chat = {
unreadMessages = 0; unreadMessages = 0;
updateVisualNotification(); updateVisualNotification();
// Undock the toolbar when the chat is shown and if we're in a
// video mode.
if (VideoLayout.isLargeVideoVisible()) {
ToolbarToggler.dockToolbar(false);
}
// if we are in conversation mode focus on the text input // if we are in conversation mode focus on the text input
// if we are not, focus on the display name input // if we are not, focus on the display name input
if (APP.settings.getDisplayName()) if (APP.settings.getDisplayName())