odit
/
mailymaily
4
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

removed completely the getE method

This commit is contained in:
Matteo Manzinello 2020-07-16 13:21:14 +02:00
parent ddfd1611db
commit bce64e879a
7 changed files with 74 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/mailgo.dark.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mailgo.dark.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mailgo.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/mailgo.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

68
lib/mailgo.js
View File

@ -622,9 +622,7 @@ var mailgoRender = function mailgoRender() {
} // validate the phone number
if (!validateTel(tel)) return; // information
// let titleEl = getE("m-tel-title");
// Telegram username
if (!validateTel(tel)) return; // Telegram username
if (mailgo.hasAttribute("data-telegram")) {
telegramUsername = mailgo.getAttribute("data-telegram");
@ -783,7 +781,7 @@ var isMailgo = function isMailgo(element) {
var mailgoCheckRender = function mailgoCheckRender(event) {
// check if the id=mailgo exists in the body
if (!document.contains(getE("mailgo")) || !document.contains(getE("mailgo-tel"))) return false; // if a mailgo is already showing do nothing
if (!document.contains(modalMailto) || !document.contains(modalTel)) return false; // if a mailgo is already showing do nothing
if (mailgoIsShowing(MAIL_TYPE) || mailgoIsShowing(TEL_TYPE)) return false; // the path of the event
@ -819,10 +817,10 @@ var mailgoCheckRender = function mailgoCheckRender(event) {
*/
var mailgoKeydown = function mailgoKeydown(event) {
var mailgoKeydown = function mailgoKeydown(keyboardEvent) {
// if mailgo is showing
if (mailgoIsShowing(MAIL_TYPE)) {
switch (event.keyCode) {
switch (keyboardEvent.keyCode) {
case 27:
// Escape
hideMailgo();
@ -853,7 +851,7 @@ var mailgoKeydown = function mailgoKeydown(event) {
return;
}
} else if (mailgoIsShowing(TEL_TYPE)) {
switch (event.keyCode) {
switch (keyboardEvent.keyCode) {
case 27:
// Escape
hideMailgo();
@ -891,26 +889,15 @@ var mailgoKeydown = function mailgoKeydown(event) {
var showMailgo = function showMailgo() {
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
// show mailgo type mail
if (type === MAIL_TYPE) {
setDisplay("mailgo", "flex");
return true;
} // show mailgo type tel
if (type === TEL_TYPE) {
setDisplay("mailgo-tel", "flex");
return true;
}
return false;
// show the correct modal
setDisplay(type, "flex");
}; // hide the modal
var hideMailgo = function hideMailgo() {
setDisplay("mailgo", "none");
setDisplay("mailgo-tel", "none"); // remove listener keyDown
// hide all the modals
setDisplay(MAIL_TYPE, "none");
setDisplay(TEL_TYPE, "none"); // remove listener keyDown
document.removeEventListener("keydown", mailgoKeydown);
}; // is the mailgo modal hidden?
@ -918,7 +905,7 @@ var hideMailgo = function hideMailgo() {
var mailgoIsShowing = function mailgoIsShowing() {
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
return type === MAIL_TYPE ? getDisplay("mailgo") === "flex" : type === TEL_TYPE ? getDisplay("mailgo-tel") === "flex" : false;
return getDisplay(type) === "flex";
};
var byElement = function byElement() {
@ -951,21 +938,39 @@ var mailToEncoded = function mailToEncoded(encoded) {
var encodeEmail = function encodeEmail(email) {
return btoa(email);
}; // getE shorthand
}; // get the correct HTMLElement from a type
var getE = function getE(id) {
return document.getElementById(id);
var getModalHTMLElement = function getModalHTMLElement() {
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : MAIL_TYPE;
return type === TEL_TYPE ? modalTel : modalMailto;
}; // get display value
var getDisplay = function getDisplay(id) {
return getE(id).style.display;
var getDisplay = function getDisplay() {
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;
}
}; // get display value
var setDisplay = function setDisplay(id, value) {
return getE(id).style.display = value;
var setDisplay = function setDisplay() {
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;
}
}; // custom composedPath if path or event.composedPath() are not defined
@ -1027,7 +1032,6 @@ var mailgoStyle = function mailgoStyle() {
// mailgo style
var mailgoCSSElement = createElement("style");
mailgoCSSElement.id = "mailgo-style";
mailgoCSSElement.type = "text/css";
mailgoCSSElement.appendChild(createTextNode(mailgoCSS));
document.head.appendChild(mailgoCSSElement);
}; // mailgo

2
lib/mailgo.js.map
View File

File diff suppressed because one or more lines are too long

67
src/mailgo.ts
View File

@ -500,9 +500,6 @@ const mailgoRender = (type = MAIL_TYPE, mailgo: HTMLLinkElement): void => {
// validate the phone number
if (!validateTel(tel)) return;
// information
// let titleEl = getE("m-tel-title");
// Telegram username
if (mailgo.hasAttribute("data-telegram")) {
telegramUsername = mailgo.getAttribute("data-telegram");
@ -694,10 +691,7 @@ const isMailgo = (element: HTMLElement, type: string = MAIL_TYPE): boolean => {
*/
const mailgoCheckRender = (event: Event): boolean => {
// check if the id=mailgo exists in the body
if (
!document.contains(getE("mailgo")) ||
!document.contains(getE("mailgo-tel"))
)
if (!document.contains(modalMailto) || !document.contains(modalTel))
return false;
// if a mailgo is already showing do nothing
@ -742,10 +736,10 @@ const mailgoCheckRender = (event: Event): boolean => {
* mailgoKeydown
* function to manage the keydown event when the modal is showing
*/
const mailgoKeydown = (event: KeyboardEvent): void => {
const mailgoKeydown = (keyboardEvent: KeyboardEvent): void => {
// if mailgo is showing
if (mailgoIsShowing(MAIL_TYPE)) {
switch (event.keyCode) {
switch (keyboardEvent.keyCode) {
case 27:
// Escape
hideMailgo();
@ -771,7 +765,7 @@ const mailgoKeydown = (event: KeyboardEvent): void => {
return;
}
} else if (mailgoIsShowing(TEL_TYPE)) {
switch (event.keyCode) {
switch (keyboardEvent.keyCode) {
case 27:
// Escape
hideMailgo();
@ -801,24 +795,16 @@ const mailgoKeydown = (event: KeyboardEvent): void => {
};
// show the modal
const showMailgo = (type = MAIL_TYPE): boolean => {
// show mailgo type mail
if (type === MAIL_TYPE) {
setDisplay("mailgo", "flex");
return true;
}
// show mailgo type tel
if (type === TEL_TYPE) {
setDisplay("mailgo-tel", "flex");
return true;
}
return false;
const showMailgo = (type = MAIL_TYPE): void => {
// show the correct modal
setDisplay(type, "flex");
};
// hide the modal
const hideMailgo = (): void => {
setDisplay("mailgo", "none");
setDisplay("mailgo-tel", "none");
// hide all the modals
setDisplay(MAIL_TYPE, "none");
setDisplay(TEL_TYPE, "none");
// remove listener keyDown
document.removeEventListener("keydown", mailgoKeydown);
@ -826,11 +812,7 @@ const hideMailgo = (): void => {
// is the mailgo modal hidden?
const mailgoIsShowing = (type = MAIL_TYPE): boolean => {
return type === MAIL_TYPE
? getDisplay("mailgo") === "flex"
: type === TEL_TYPE
? getDisplay("mailgo-tel") === "flex"
: false;
return getDisplay(type) === "flex";
};
const byElement = (): HTMLLinkElement => {
@ -860,15 +842,32 @@ const mailToEncoded = (encoded: string): string =>
// encode email
const encodeEmail = (email: string): string => btoa(email);
// getE shorthand
const getE = (id: string): HTMLElement => document.getElementById(id);
// get the correct HTMLElement from a type
const getModalHTMLElement = (type: string = MAIL_TYPE) => {
return type === TEL_TYPE ? modalTel : modalMailto;
};
// get display value
const getDisplay = (id: string): string => getE(id).style.display;
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;
}
};
// get display value
const setDisplay = (id: string, value: string): string =>
(getE(id).style.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);
}
};
// custom composedPath if path or event.composedPath() are not defined
const composedPath = (