From 1db57ce95cf1e605106a52306118273d89572403 Mon Sep 17 00:00:00 2001 From: Matteo Manzinello Date: Sat, 4 May 2019 00:19:24 +0200 Subject: [PATCH] prelevo in modo corretto l'email --- dist/mailgo.js | 10 +++++++++- dist/mailgo.min.js | 2 +- src/mailgo.js | 8 +++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dist/mailgo.js b/dist/mailgo.js index f7943a6..834242a 100644 --- a/dist/mailgo.js +++ b/dist/mailgo.js @@ -47,10 +47,18 @@ console.log("mailgo is WIP!"); // attivo mailgo su tutti gli elementi mailgos.forEach((mailgo, index) => { + let mail = mailgo.href + .split("?")[0] + .split("mailto:")[1] + .trim(); + + console.log(mail); + + if (!validateEmail(mail)) return; + let url = new URL(mailgo.href); let urlParams = new URLSearchParams(url.search); - let mail = url.hostname; let subject = urlParams.get("subject"); let body = urlParams.get("body"); let cc = urlParams.get("cc"); diff --git a/dist/mailgo.min.js b/dist/mailgo.min.js index ced50fd..497905a 100644 --- a/dist/mailgo.min.js +++ b/dist/mailgo.min.js @@ -1 +1 @@ -let mailgos=document.querySelectorAll('a[href^="mailto:"]:not(.no-mailgo)'),styles='\n .mailgo-modal-background {\n position: absolute;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n background-color: rgba(10,10,10,.86);\n opacity: 0.8;\n }\n .mailgo-modal {\n position: fixed;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n display: none;\n font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";\n }\n .mailgo-modal.is-active {\n display: flex;\n justify-content: center;\n align-items: center;\n }\n .mailgo-modal-content {\n z-index: 1000;\n width: 400px;\n background-color: #fff;\n border-radius: 6px;\n box-shadow: 0 2px 3px rgba(10,10,10,.1), 0 0 0 1px rgba(10,10,10,.1);\n color: #4a4a4a;\n display: block;\n padding: 1.25rem;\n }\n',styleSheet=document.createElement("style");function validateEmail(e){return/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(e)}styleSheet.type="text/css",styleSheet.innerText=styles,document.head.appendChild(styleSheet),console.log("mailgo is WIP!"),mailgos.forEach((e,t)=>{let n=new URL(e.href),a=new URLSearchParams(n.search),o=n.hostname,l=(a.get("subject"),a.get("body"),a.get("cc"),a.get("bcc"),document.createElement("div"));l.className="mailgo-modal",l.setAttribute("data-index",t);let i=document.createElement("div");i.className="mailgo-modal-background",l.appendChild(i);let s=document.createElement("div");s.className="mailgo-modal-content",l.appendChild(s);let d=document.createElement("strong"),c=document.createTextNode(o);d.appendChild(c),s.appendChild(d),e.parentNode.insertBefore(l,e.nextSibling),e.addEventListener("click",t=>{t.preventDefault(),e.nextElementSibling.classList.add("is-active")},!1),i.addEventListener("click",t=>{e.nextElementSibling.classList.remove("is-active")},!1)}); \ No newline at end of file +let mailgos=document.querySelectorAll('a[href^="mailto:"]:not(.no-mailgo)'),styles='\n .mailgo-modal-background {\n position: absolute;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n background-color: rgba(10,10,10,.86);\n opacity: 0.8;\n }\n .mailgo-modal {\n position: fixed;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n display: none;\n font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";\n }\n .mailgo-modal.is-active {\n display: flex;\n justify-content: center;\n align-items: center;\n }\n .mailgo-modal-content {\n z-index: 1000;\n width: 400px;\n background-color: #fff;\n border-radius: 6px;\n box-shadow: 0 2px 3px rgba(10,10,10,.1), 0 0 0 1px rgba(10,10,10,.1);\n color: #4a4a4a;\n display: block;\n padding: 1.25rem;\n }\n',styleSheet=document.createElement("style");function validateEmail(e){return/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(e)}styleSheet.type="text/css",styleSheet.innerText=styles,document.head.appendChild(styleSheet),console.log("mailgo is WIP!"),mailgos.forEach((e,t)=>{let n=e.href.split("?")[0].split("mailto:")[1].trim();if(console.log(n),!validateEmail(n))return;let a=new URL(e.href),l=new URLSearchParams(a.search),o=(l.get("subject"),l.get("body"),l.get("cc"),l.get("bcc"),document.createElement("div"));o.className="mailgo-modal",o.setAttribute("data-index",t);let i=document.createElement("div");i.className="mailgo-modal-background",o.appendChild(i);let s=document.createElement("div");s.className="mailgo-modal-content",o.appendChild(s);let d=document.createElement("strong"),c=document.createTextNode(n);d.appendChild(c),s.appendChild(d),e.parentNode.insertBefore(o,e.nextSibling),e.addEventListener("click",t=>{t.preventDefault(),e.nextElementSibling.classList.add("is-active")},!1),i.addEventListener("click",t=>{e.nextElementSibling.classList.remove("is-active")},!1)}); \ No newline at end of file diff --git a/src/mailgo.js b/src/mailgo.js index 25592fd..d5fe4b3 100644 --- a/src/mailgo.js +++ b/src/mailgo.js @@ -47,10 +47,16 @@ console.log("mailgo is WIP!"); // attivo mailgo su tutti gli elementi mailgos.forEach((mailgo, index) => { + let mail = mailgo.href + .split("?")[0] + .split("mailto:")[1] + .trim(); + + if (!validateEmail(mail)) return; + let url = new URL(mailgo.href); let urlParams = new URLSearchParams(url.search); - let mail = url.split("?")[0]; let subject = urlParams.get("subject"); let body = urlParams.get("body"); let cc = urlParams.get("cc");