From 0653631200b88984f5f47d141cd9ac31c7daaea0 Mon Sep 17 00:00:00 2001 From: Matteo Manzinello Date: Sun, 5 May 2019 21:43:17 +0200 Subject: [PATCH] mostro correttamente cc, bcc, body e subject --- dist/mailgo.js | 62 ++++++++++++++++++++++++++++++++++++++-------- dist/mailgo.min.js | 2 +- src/mailgo.js | 16 ++++++------ 3 files changed, 61 insertions(+), 19 deletions(-) diff --git a/dist/mailgo.js b/dist/mailgo.js index 99e3937..3f25b5b 100644 --- a/dist/mailgo.js +++ b/dist/mailgo.js @@ -11,9 +11,11 @@ let styles = ` } .mailgo-details { font-size: 12px; + margin-bottom: 10px; } .mailgo-details p { - margin-top: 5px; + margin-top: 3px; + margin-bottom: 3px; } .mailgo-modal-background { position: absolute; @@ -112,7 +114,7 @@ function mailgoInit() { let cc = urlParams.get("cc"); let bcc = urlParams.get("bcc"); let subject = urlParams.get("subject"); - let body = urlParams.get("body"); + let bodyMail = urlParams.get("body"); if (!validateEmail(mail)) return; @@ -140,15 +142,53 @@ function mailgoInit() { let details = document.createElement("div"); details.className = "mailgo-details"; - let detailCC = document.createElement("p"); - let ccSpan = document.createElement("span"); - ccSpan.className = "mailgo-weight-500"; - let ccContent = document.createTextNode("cc"); - ccSpan.appendChild(ccContent); - let ccValue = document.createTextNode(": " + cc); - detailCC.appendChild(ccSpan); - detailCC.appendChild(ccValue); - details.appendChild(detailCC); + if (cc && cc != "") { + let detailCC = document.createElement("p"); + let ccSpan = document.createElement("span"); + ccSpan.className = "mailgo-weight-500"; + let ccContent = document.createTextNode("cc"); + ccSpan.appendChild(ccContent); + let ccValue = document.createTextNode(": " + cc); + detailCC.appendChild(ccSpan); + detailCC.appendChild(ccValue); + details.appendChild(detailCC); + } + + if (bcc && bcc != "") { + let detailBCC = document.createElement("p"); + let bccSpan = document.createElement("span"); + bccSpan.className = "mailgo-weight-500"; + let bccContent = document.createTextNode("bcc"); + bccSpan.appendChild(bccContent); + let bccValue = document.createTextNode(": " + bcc); + detailBCC.appendChild(bccSpan); + detailBCC.appendChild(bccValue); + details.appendChild(detailBCC); + } + + if (subject && subject != "") { + let detailSUBJECT = document.createElement("p"); + let subjectSpan = document.createElement("span"); + subjectSpan.className = "mailgo-weight-500"; + let subjectContent = document.createTextNode("cc"); + subjectSpan.appendChild(subjectContent); + let subjectValue = document.createTextNode(": " + subject); + detailSUBJECT.appendChild(subjectSpan); + detailSUBJECT.appendChild(subjectValue); + details.appendChild(detailSUBJECT); + } + + if (bodyMail && bodyMail != "") { + let detailBODY = document.createElement("p"); + let bodySpan = document.createElement("span"); + bodySpan.className = "mailgo-weight-500"; + let bodyContent = document.createTextNode("cc"); + bodySpan.appendChild(bodyContent); + let bodyValue = document.createTextNode(": " + bodyMail); + detailBODY.appendChild(bodySpan); + detailBODY.appendChild(bodyValue); + details.appendChild(detailBODY); + } modalContent.appendChild(details); diff --git a/dist/mailgo.min.js b/dist/mailgo.min.js index 172a0fe..23bc59c 100644 --- a/dist/mailgo.min.js +++ b/dist/mailgo.min.js @@ -1 +1 @@ -let styles='\n .mailgo-modal {\n all: initial;\n * {\n all: unset;\n }\n }\n .mailgo-title {\n display: block;\n margin-bottom: 5px;\n }\n .mailgo-details {\n font-size: 12px;\n }\n .mailgo-details p {\n margin-top: 5px;\n }\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 text-align: center;\n width: 200px;\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 .mailgo-modal-content a {\n display: block;\n color: #4a4a4a;\n border-radius: 4px;\n text-decoration: none;\n }\n .mailgo-modal-content a {\n padding: 10px;\n }\n .mailgo-modal-content a.mailgo-open:hover, .mailgo-modal-content a.mailgo-copy:hover {\n background-color: rgba(0, 0, 0, 0.08);\n }\n .mailgo-modal-content a.outlook {\n color: #0072C6;\n }\n .mailgo-modal-content a.gmail {\n color: #D44638;\n }\n .mailgo-modal-content a.outlook:hover {\n background-color: rgba(0, 114, 198, 0.08);\n }\n .mailgo-modal-content a.gmail:hover {\n background-color: rgba(212, 70, 56, 0.08);\n }\n a.mailgo-copy {\n margin-top: 10px;\n padding: 16px 10px;\n }\n .mailgo-by {\n display: block;\n font-size: 8px;\n margin-top: 0.75rem;\n }\n .mailgo-weight-500 {\n font-weight: 500;\n }\n';function mailgoInit(){let e=document.querySelectorAll('a[href^="mailto:"]:not(.no-mailgo)'),t=document.createElement("style");t.type="text/css",t.innerText=styles,document.head.appendChild(t),console.log("mailgo is WIP!"),e.forEach(function(e,t){let n=e.href.split("?")[0].split("mailto:")[1].trim(),o=new URL(e.href),a=new URLSearchParams(o.search),l=a.get("cc");a.get("bcc"),a.get("subject"),a.get("body");if(!validateEmail(n))return;let i=document.createElement("div");i.className="mailgo-modal",i.setAttribute("data-index",t);let d=document.createElement("div");d.className="mailgo-modal-background",i.appendChild(d);let c=document.createElement("div");c.className="mailgo-modal-content",i.appendChild(c);let m=document.createElement("strong");m.className="mailgo-title";let r=document.createTextNode(n);m.appendChild(r),c.appendChild(m);let s=document.createElement("div");s.className="mailgo-details";let p=document.createElement("p"),g=document.createElement("span");g.className="mailgo-weight-500";let u=document.createTextNode("cc");g.appendChild(u);let h=document.createTextNode(": "+l);p.appendChild(g),p.appendChild(h),s.appendChild(p),c.appendChild(s);let b=document.createElement("a");b.href="https://mail.google.com/mail?extsrc=mailto&url="+e.href,b.classList.add("mailgo-open"),b.classList.add("gmail");let x=document.createTextNode("open in ");b.appendChild(x);let f=document.createElement("span");f.className="mailgo-weight-500";let y=document.createTextNode("Gmail");f.appendChild(y),b.appendChild(f),c.appendChild(b);let C=document.createElement("a");C.href="https://outlook.office.com/owa/?rru=compose&to="+n+o.search,C.classList.add("mailgo-open"),C.classList.add("outlook");let E=document.createTextNode("open in ");C.appendChild(E);let v=document.createElement("span");v.className="mailgo-weight-500";let k=document.createTextNode("Outlook");v.appendChild(k),C.appendChild(v),c.appendChild(C);let N=document.createElement("a");N.href=e.href,N.classList.add("mailgo-open"),N.classList.add("mailgo-weight-500");let L=document.createTextNode("open");N.appendChild(L),c.appendChild(N);let S=document.createElement("a");S.href="#mailgo-copy",S.classList.add("mailgo-copy"),S.classList.add("mailgo-weight-500");let T=document.createTextNode("copy");S.appendChild(T),S.addEventListener("click",function(e){copyToClipboard(n),S.innerHTML="copied!"},!1),c.appendChild(S);let w=document.createElement("a");w.href="https://mailgo.js.org",w.className="mailgo-by",w.target="_blank";let A=document.createTextNode("mailgo.js.org");w.appendChild(A),c.appendChild(w),e.parentNode.insertBefore(i,e.nextSibling),e.addEventListener("click",function(t){t.preventDefault(),e.nextElementSibling.classList.add("is-active")},!1),d.addEventListener("click",function(t){e.nextElementSibling.classList.remove("is-active")},!1)})}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)}function copyToClipboard(e){const t=document.createElement("textarea");t.value=e,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t);const n=document.getSelection().rangeCount>0&&document.getSelection().getRangeAt(0);t.select(),document.execCommand("copy"),document.body.removeChild(t),n&&(document.getSelection().removeAllRanges(),document.getSelection().addRange(n))}document.addEventListener("DOMContentLoaded",mailgoInit,!1); \ No newline at end of file +let styles='\n .mailgo-modal {\n all: initial;\n * {\n all: unset;\n }\n }\n .mailgo-title {\n display: block;\n margin-bottom: 5px;\n }\n .mailgo-details {\n font-size: 12px;\n margin-bottom: 10px;\n }\n .mailgo-details p {\n margin-top: 3px;\n margin-bottom: 3px;\n }\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 text-align: center;\n width: 200px;\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 .mailgo-modal-content a {\n display: block;\n color: #4a4a4a;\n border-radius: 4px;\n text-decoration: none;\n }\n .mailgo-modal-content a {\n padding: 10px;\n }\n .mailgo-modal-content a.mailgo-open:hover, .mailgo-modal-content a.mailgo-copy:hover {\n background-color: rgba(0, 0, 0, 0.08);\n }\n .mailgo-modal-content a.outlook {\n color: #0072C6;\n }\n .mailgo-modal-content a.gmail {\n color: #D44638;\n }\n .mailgo-modal-content a.outlook:hover {\n background-color: rgba(0, 114, 198, 0.08);\n }\n .mailgo-modal-content a.gmail:hover {\n background-color: rgba(212, 70, 56, 0.08);\n }\n a.mailgo-copy {\n margin-top: 10px;\n padding: 16px 10px;\n }\n .mailgo-by {\n display: block;\n font-size: 8px;\n margin-top: 0.75rem;\n }\n .mailgo-weight-500 {\n font-weight: 500;\n }\n';function mailgoInit(){let e=document.querySelectorAll('a[href^="mailto:"]:not(.no-mailgo)'),t=document.createElement("style");t.type="text/css",t.innerText=styles,document.head.appendChild(t),console.log("mailgo is WIP!"),e.forEach(function(e,t){let n=e.href.split("?")[0].split("mailto:")[1].trim(),a=new URL(e.href),o=new URLSearchParams(a.search),l=o.get("cc"),d=o.get("bcc"),i=o.get("subject"),c=o.get("body");if(!validateEmail(n))return;let m=document.createElement("div");m.className="mailgo-modal",m.setAttribute("data-index",t);let p=document.createElement("div");p.className="mailgo-modal-background",m.appendChild(p);let r=document.createElement("div");r.className="mailgo-modal-content",m.appendChild(r);let s=document.createElement("strong");s.className="mailgo-title";let g=document.createTextNode(n);s.appendChild(g),r.appendChild(s);let u=document.createElement("div");if(u.className="mailgo-details",l&&""!=l){let e=document.createElement("p"),t=document.createElement("span");t.className="mailgo-weight-500";let n=document.createTextNode("cc");t.appendChild(n);let a=document.createTextNode(": "+l);e.appendChild(t),e.appendChild(a),u.appendChild(e)}if(d&&""!=d){let e=document.createElement("p"),t=document.createElement("span");t.className="mailgo-weight-500";let n=document.createTextNode("bcc");t.appendChild(n);let a=document.createTextNode(": "+d);e.appendChild(t),e.appendChild(a),u.appendChild(e)}if(i&&""!=i){let e=document.createElement("p"),t=document.createElement("span");t.className="mailgo-weight-500";let n=document.createTextNode("cc");t.appendChild(n);let a=document.createTextNode(": "+i);e.appendChild(t),e.appendChild(a),u.appendChild(e)}if(c&&""!=c){let e=document.createElement("p"),t=document.createElement("span");t.className="mailgo-weight-500";let n=document.createTextNode("cc");t.appendChild(n);let a=document.createTextNode(": "+c);e.appendChild(t),e.appendChild(a),u.appendChild(e)}r.appendChild(u);let h=document.createElement("a");h.href="https://mail.google.com/mail?extsrc=mailto&url="+e.href,h.classList.add("mailgo-open"),h.classList.add("gmail");let x=document.createTextNode("open in ");h.appendChild(x);let b=document.createElement("span");b.className="mailgo-weight-500";let C=document.createTextNode("Gmail");b.appendChild(C),h.appendChild(b),r.appendChild(h);let f=document.createElement("a");f.href="https://outlook.office.com/owa/?rru=compose&to="+n+a.search,f.classList.add("mailgo-open"),f.classList.add("outlook");let y=document.createTextNode("open in ");f.appendChild(y);let E=document.createElement("span");E.className="mailgo-weight-500";let N=document.createTextNode("Outlook");E.appendChild(N),f.appendChild(E),r.appendChild(f);let v=document.createElement("a");v.href=e.href,v.classList.add("mailgo-open"),v.classList.add("mailgo-weight-500");let k=document.createTextNode("open");v.appendChild(k),r.appendChild(v);let T=document.createElement("a");T.href="#mailgo-copy",T.classList.add("mailgo-copy"),T.classList.add("mailgo-weight-500");let L=document.createTextNode("copy");T.appendChild(L),T.addEventListener("click",function(e){copyToClipboard(n),T.innerHTML="copied!"},!1),r.appendChild(T);let w=document.createElement("a");w.href="https://mailgo.js.org",w.className="mailgo-by",w.target="_blank";let S=document.createTextNode("mailgo.js.org");w.appendChild(S),r.appendChild(w),e.parentNode.insertBefore(m,e.nextSibling),e.addEventListener("click",function(t){t.preventDefault(),e.nextElementSibling.classList.add("is-active")},!1),p.addEventListener("click",function(t){e.nextElementSibling.classList.remove("is-active")},!1)})}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)}function copyToClipboard(e){const t=document.createElement("textarea");t.value=e,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t);const n=document.getSelection().rangeCount>0&&document.getSelection().getRangeAt(0);t.select(),document.execCommand("copy"),document.body.removeChild(t),n&&(document.getSelection().removeAllRanges(),document.getSelection().addRange(n))}document.addEventListener("DOMContentLoaded",mailgoInit,!1); \ No newline at end of file diff --git a/src/mailgo.js b/src/mailgo.js index e56154c..3f25b5b 100644 --- a/src/mailgo.js +++ b/src/mailgo.js @@ -11,9 +11,11 @@ let styles = ` } .mailgo-details { font-size: 12px; + margin-bottom: 10px; } .mailgo-details p { - margin-top: 5px; + margin-top: 3px; + margin-bottom: 3px; } .mailgo-modal-background { position: absolute; @@ -140,7 +142,7 @@ function mailgoInit() { let details = document.createElement("div"); details.className = "mailgo-details"; - if (cc != "") { + if (cc && cc != "") { let detailCC = document.createElement("p"); let ccSpan = document.createElement("span"); ccSpan.className = "mailgo-weight-500"; @@ -152,19 +154,19 @@ function mailgoInit() { details.appendChild(detailCC); } - if (bcc != "") { + if (bcc && bcc != "") { let detailBCC = document.createElement("p"); let bccSpan = document.createElement("span"); bccSpan.className = "mailgo-weight-500"; let bccContent = document.createTextNode("bcc"); - bccSpan.appendChild(ccContent); + bccSpan.appendChild(bccContent); let bccValue = document.createTextNode(": " + bcc); detailBCC.appendChild(bccSpan); detailBCC.appendChild(bccValue); details.appendChild(detailBCC); } - if (subject != "") { + if (subject && subject != "") { let detailSUBJECT = document.createElement("p"); let subjectSpan = document.createElement("span"); subjectSpan.className = "mailgo-weight-500"; @@ -176,13 +178,13 @@ function mailgoInit() { details.appendChild(detailSUBJECT); } - if (bodyMail != "") { + if (bodyMail && bodyMail != "") { let detailBODY = document.createElement("p"); let bodySpan = document.createElement("span"); bodySpan.className = "mailgo-weight-500"; let bodyContent = document.createTextNode("cc"); bodySpan.appendChild(bodyContent); - let bodyValue = document.createTextNode(": " + body); + let bodyValue = document.createTextNode(": " + bodyMail); detailBODY.appendChild(bodySpan); detailBODY.appendChild(bodyValue); details.appendChild(detailBODY);