TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Added ESC to modal

Browse source 
Signed-off-by: WolverinDEV <git@teaspeak.de>
This commit is contained in:
WolverinDEV 2019-12-20 21:17:31 +01:00
parent f7b0e4814d
commit fee476da2c
No known key found for this signature in database
GPG key ID: 77A6C15085150EEB
1 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
shared/js/ui/elements/modal.ts
View file

@ -9,7 +9,8 @@ enum ElementType {
type BodyCreator = (() => JQuery | JQuery[] | string) | string | JQuery | JQuery[];
const ModalFunctions = {
divify: function (val: JQuery) {
if(val.length > 1) return $.spawn("div").append(val);
if(val.length > 1)
return $.spawn("div").append(val);
return val;
},
@ -42,8 +43,9 @@ const ModalFunctions = {
},
warpProperties(data: ModalProperties | any) : ModalProperties {
if(data instanceof ModalProperties) return data;
else {
if(data instanceof ModalProperties) {
return data;
} else {
const props = new ModalProperties();
for(const key of Object.keys(data))
props[key] = data[key];
@ -109,6 +111,32 @@ $(document).on('mousedown', (event: JQuery.MouseDownEvent) => {
} while((element = element.parentElement));
});
$(document).on('keyup', (event: JQuery.KeyUpEvent) => {
if(_global_modal_count == 0 || typeof(event.target) === "undefined")
return;
if(event.key !== "Escape")
return;
let element = event.target as HTMLElement;
if(element.nodeName == "HTMLInputElement" || element.nodeName == "HTMLSelectElement" || element.nodeName == "HTMLTextAreaElement")
return;
do {
if(element.classList.contains('modal-content'))
break;
if(!element.classList.contains('modal'))
continue;
if(element == _global_modal_last && _global_modal_last_time + 100 > Date.now())
break;
$(element).find("> .modal-dialog > .modal-content > .modal-header .button-modal-close").trigger('click');
break;
} while((element = element.parentElement));
});
let _global_modal_count = 0;
let _global_modal_last: HTMLElement;
let _global_modal_last_time: number;