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

Merge pull request #1024 from BeatC/shortcut-dialog-fixes 

Fix shortcut dialog toggling
This commit is contained in:
yanas 2016-10-17 23:40:22 -05:00 committed by GitHub
parent 3ecc24d85e d06aef511f
commit 442d2fa316
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/UI/UI.js
View File

@ -1491,12 +1491,17 @@ UI.hideUserMediaPermissionsGuidanceOverlay = function () {
* Shows or hides the keyboard shortcuts panel, depending on the current state.'
*/
UI.toggleKeyboardShortcutsPanel = function() {
let titleKey = 'keyboardShortcuts.keyboardShortcuts';
let title = APP.translation.translateString(titleKey);
let msg = $('#keyboard-shortcuts').html();
let buttons = { Close: true };
if (!messageHandler.isDialogOpened()) {
let titleKey = 'keyboardShortcuts.keyboardShortcuts';
let title = APP.translation.translateString(titleKey);
let msg = $('#keyboard-shortcuts').html();
let buttons = { Close: true };
messageHandler.openDialog(title, msg, true, buttons);
} else {
messageHandler.closeDialog();
}
messageHandler.openDialog(title, msg, true, buttons);
};
/**

9
modules/UI/util/MessageHandler.js
View File

@ -373,6 +373,15 @@ var messageHandler = {
enablePopups: function (enable) {
popupEnabled = enable;
},
/**
* Returns true if dialog is opened
* false otherwise
* @returns {boolean} isOpened
*/
isDialogOpened: function () {
return !!$.prompt.getCurrentStateName();
}
};