new getModalDisplay and setModalDisplay

This commit is contained in:
Matteo Manzinello 2020-07-16 14:24:45 +02:00
parent fcbe3af4e0
commit cac9fa594d
7 changed files with 25 additions and 51 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
dist/mailgo.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -641,10 +641,10 @@ var mailgoRender = function mailgoRender() {
wa.addEventListener("click", openWhatsApp); // telegram must be shown only if data-telegram is provided
if (telegramUsername) {
setDisplay("m-tg", "block");
document.getElementById("m-tg").style.display = "block";
telegram.addEventListener("click", openTelegram);
} else {
setDisplay("m-tg", "none");
document.getElementById("m-tg").style.display = "none";
}
skype.addEventListener("click", openSkype);
@ -894,14 +894,14 @@ var mailgoKeydown = function mailgoKeydown(keyboardEvent) {
var showMailgo = function showMailgo() {
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
// show the correct modal
setDisplay(type, "flex");
setModalDisplay(type, "flex");
}; // hide the modal
var hideMailgo = function hideMailgo() {
// hide all the modals
setDisplay(MAIL_TYPE, "none");
setDisplay(TEL_TYPE, "none"); // remove listener keyDown
setModalDisplay(MAIL_TYPE, "none");
setModalDisplay(TEL_TYPE, "none"); // remove listener keyDown
document.removeEventListener("keydown", mailgoKeydown);
}; // is the mailgo modal hidden?
@ -909,7 +909,7 @@ var hideMailgo = function hideMailgo() {
var mailgoIsShowing = function mailgoIsShowing() {
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
return getDisplay(type) === "flex";
return getModalDisplay(type) === "flex";
};
var byElement = function byElement() {
@ -951,30 +951,16 @@ var getModalHTMLElement = function getModalHTMLElement() {
}; // get display value
var getDisplay = function getDisplay() {
var getModalDisplay = function getModalDisplay() {
var ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
if (ref === MAIL_TYPE || ref === TEL_TYPE) {
// if a type is passed return the display of the modals
return getModalHTMLElement(ref).style.display;
} else {
// else return the element get by ID
return document.getElementById(ref).style.display;
}
return getModalHTMLElement(ref).style.display;
}; // get display value
var setDisplay = function setDisplay() {
var setModalDisplay = function setModalDisplay() {
var ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
var value = arguments.length > 1 ? arguments[1] : undefined;
if (ref === MAIL_TYPE || ref === TEL_TYPE) {
// if a type is passed return the display of the modals
return getModalHTMLElement(ref).style.display = value;
} else {
// else return the element get by ID
return document.getElementById(ref).style.display = value;
}
return getModalHTMLElement(ref).style.display = value;
}; // custom composedPath if path or event.composedPath() are not defined

File diff suppressed because one or more lines are too long

View File

@ -520,10 +520,10 @@ const mailgoRender = (type = MAIL_TYPE, mailgo: HTMLLinkElement): void => {
// telegram must be shown only if data-telegram is provided
if (telegramUsername) {
setDisplay("m-tg", "block");
document.getElementById("m-tg").style.display = "block";
telegram.addEventListener("click", openTelegram);
} else {
setDisplay("m-tg", "none");
document.getElementById("m-tg").style.display = "none";
}
skype.addEventListener("click", openSkype);
@ -802,14 +802,14 @@ const mailgoKeydown = (keyboardEvent: KeyboardEvent): void => {
// show the modal
const showMailgo = (type = MAIL_TYPE): void => {
// show the correct modal
setDisplay(type, "flex");
setModalDisplay(type, "flex");
};
// hide the modal
const hideMailgo = (): void => {
// hide all the modals
setDisplay(MAIL_TYPE, "none");
setDisplay(TEL_TYPE, "none");
setModalDisplay(MAIL_TYPE, "none");
setModalDisplay(TEL_TYPE, "none");
// remove listener keyDown
document.removeEventListener("keydown", mailgoKeydown);
@ -817,7 +817,7 @@ const hideMailgo = (): void => {
// is the mailgo modal hidden?
const mailgoIsShowing = (type = MAIL_TYPE): boolean => {
return getDisplay(type) === "flex";
return getModalDisplay(type) === "flex";
};
const byElement = (): HTMLLinkElement => {
@ -853,25 +853,13 @@ const getModalHTMLElement = (type: string = MAIL_TYPE) => {
};
// get display value
const getDisplay = (ref: string = MAIL_TYPE): string => {
if (ref === MAIL_TYPE || ref === TEL_TYPE) {
// if a type is passed return the display of the modals
return getModalHTMLElement(ref).style.display;
} else {
// else return the element get by ID
return document.getElementById(ref).style.display;
}
const getModalDisplay = (ref: string = MAIL_TYPE): string => {
return getModalHTMLElement(ref).style.display;
};
// get display value
const setDisplay = (ref: string = MAIL_TYPE, value: string): string => {
if (ref === MAIL_TYPE || ref === TEL_TYPE) {
// if a type is passed return the display of the modals
return (getModalHTMLElement(ref).style.display = value);
} else {
// else return the element get by ID
return (document.getElementById(ref).style.display = value);
}
const setModalDisplay = (ref: string = MAIL_TYPE, value: string): string => {
return (getModalHTMLElement(ref).style.display = value);
};
// custom composedPath if path or event.composedPath() are not defined