diff --git a/dist/mailgo.js b/dist/mailgo.js
index 94c6c91..e45d04b 100644
--- a/dist/mailgo.js
+++ b/dist/mailgo.js
@@ -240,13 +240,17 @@ var mailgoRender = function mailgoRender(mailgo) {
var actions = {
openGmail: function openGmail(mailtoHref) {
- return window.open("https://mail.google.com/mail?extsrc=mailto&url=" + encodeURIComponent(mailtoHref), "_blank");
+ var gmailUrl = "https://mail.google.com/mail?extsrc=mailto&url=" + encodeURIComponent(mailtoHref);
+ window.open(gmailUrl, "_blank");
},
- openOutlook: function openOutlook(mail, url) {
- return window.open("https://outlook.live.com/owa/?path=/mail/action/compose&to=" + encodeURIComponent(mail) + url.search.replace(/^[$]/, "&"), "_blank");
+ openOutlook: function openOutlook(mail, bodyMail, subject) {
+ var outlookUrl = "https://outlook.live.com/owa/?path=/mail/action/compose&to=" + encodeURIComponent(mail);
+ if (subject != "") outlookUrl = outlookUrl + "&subject=" + subject;
+ if (bodyMail != "") outlookUrl = outlookUrl + "&body=" + bodyMail;
+ window.open(outlookUrl, "_blank");
},
openDefault: function openDefault(encEmail) {
- return mailToEncoded(encEmail);
+ mailToEncoded(encEmail);
},
copy: function copy(mail, copyButton) {
copyToClipboard(mail);
@@ -255,6 +259,14 @@ var actions = {
return copyButton.textContent = "copy";
}, 999);
}
+}; // function that returns if an element is a mailgo
+
+var isMailgo = function isMailgo(element) {
+ return (// first case: it is an element with "mailto:..." in href and no no-mailgo in classList
+ element.href && element.href.toLowerCase().startsWith(MAILTO) && !element.classList.contains("no-mailgo") || // second case: the href=#mailgo
+ element.href && element.getAttribute("href").toLowerCase() === "#mailgo" || // third case: the classList contains mailgo
+ element.classList.contains("mailgo")
+ );
};
/**
* mailgoCheckRender
@@ -264,22 +276,19 @@ var actions = {
* );
*/
+
var mailgoCheckRender = function mailgoCheckRender(event) {
// check if the id=mailgo exists in the body
if (!document.contains(getE("mailgo"))) return; // go in the event.path to find if the user has clicked on a mailgo element
- event.path.forEach(function (e) {
- if ( // first case: it is an element with "mailto:..." in href and no no-mailgo in classList
- e.href && e.href.toLowerCase().startsWith(MAILTO) && !e.classList.contains("no-mailgo") || // second case: the href=#mailgo
- e.href && e.getAttribute("href").toLowerCase() === "#mailgo" || // third case: the classList contains mailgo
- e.classList.contains("mailgo")) {
- // stop the normal execution of the element click
- event.preventDefault(); // render mailgo
+ if (event.path.some(isMailgo)) {
+ // stop the normal execution of the element click
+ event.preventDefault(); // render mailgo
+
+ mailgoRender(e);
+ return;
+ }
- mailgoRender(e);
- return;
- }
- });
return;
};
/**
diff --git a/dist/mailgo.min.js b/dist/mailgo.min.js
index 0ae4f7e..da41ce9 100644
--- a/dist/mailgo.min.js
+++ b/dist/mailgo.min.js
@@ -1 +1 @@
-"use strict";var V="0.4.7",MAILTO="mailto:",mailgoCSS=document.createElement("link");mailgoCSS.rel="stylesheet",mailgoCSS.type="text/css",mailgoCSS.href="https://unpkg.com/mailgo@"+V+"/dist/mailgo.min.css",document.head.appendChild(mailgoCSS);var mailgoInit=function(){var e=document.createElement("div");e.id="mailgo",e.classList.add("mailgo-modal"),e.style.display="none";var t=document.createElement("div");t.className="mailgo-modal-background",e.appendChild(t);var a=document.createElement("div");a.className="mailgo-modal-content",e.appendChild(a);var o=document.createElement("strong");o.id="mailgo-title",o.className="mailgo-title",a.appendChild(o);var n=document.createElement("div");n.id="mailgo-details",n.className="mailgo-details";var i=document.createElement("p");i.id="mailgo-cc";var l=document.createElement("span");l.className="mailgo-weight-500";var d=document.createTextNode("cc ");l.appendChild(d);var c=document.createElement("span");c.id="mailgo-cc-value",i.appendChild(l),i.appendChild(c),n.appendChild(i);var m=document.createElement("p");m.id="mailgo-bcc";var r=document.createElement("span");r.className="mailgo-weight-500";var s=document.createTextNode("bcc ");r.appendChild(s);var p=document.createElement("span");p.id="mailgo-bcc-value",m.appendChild(r),m.appendChild(p),n.appendChild(m);var g=document.createElement("p");g.id="mailgo-subject";var u=document.createElement("span");u.className="mailgo-weight-500";var h=document.createTextNode("subject ");u.appendChild(h);var v=document.createElement("span");v.id="mailgo-subject-value",g.appendChild(u),g.appendChild(v),n.appendChild(g);var C=document.createElement("p");C.id="mailgo-body";var E=document.createElement("span");E.className="mailgo-weight-500";var y=document.createTextNode("body ");E.appendChild(y);var f=document.createElement("span");f.id="mailgo-body-value",C.appendChild(E),C.appendChild(f),n.appendChild(C),a.appendChild(n);var b=document.createElement("a");b.id="mailgo-gmail",b.href="#mailgo-gmail",b.classList.add("mailgo-open"),b.classList.add("mailgo-gmail");var k=document.createTextNode("open in ");b.appendChild(k);var L=document.createElement("span");L.className="mailgo-weight-500";var w=document.createTextNode("Gmail");L.appendChild(w),b.appendChild(L),a.appendChild(b);var x=document.createElement("a");x.id="mailgo-outlook",x.href="#mailgo-outlook",x.classList.add("mailgo-open"),x.classList.add("mailgo-outlook");var N=document.createTextNode("open in ");x.appendChild(N);var T=document.createElement("span");T.className="mailgo-weight-500";var A=document.createTextNode("Outlook");T.appendChild(A),x.appendChild(T),a.appendChild(x);var S=document.createElement("a");S.id="mailgo-open",S.href="#mailgo-open",S.classList.add("mailgo-open"),S.classList.add("mailgo-default");var I=document.createElement("span");I.className="mailgo-weight-500";var R=document.createTextNode("open");I.appendChild(R);var M=document.createTextNode(" default");S.appendChild(I),S.appendChild(M),a.appendChild(S);var O=document.createElement("a");O.id="mailgo-copy",O.href="#mailgo-copy",O.classList.add("mailgo-copy"),O.classList.add("mailgo-weight-500");var j=document.createTextNode("copy");O.appendChild(j),a.appendChild(O);var U=document.createElement("a");U.href="https://mailgo.js.org?ref=mailgo-modal",U.className="mailgo-by",U.target="_blank",U.rel="noopener noreferrer";var D=document.createTextNode("mailgo.js.org");U.appendChild(D),a.appendChild(U),document.body.appendChild(e),t.addEventListener("click",hideMailgo)},mailgoRender=function(e){var t="",a="",o="",n="",i="",l="",d="";if(e.href&&e.href.toLowerCase().startsWith(MAILTO)){t=decodeURIComponent(e.href.split("?")[0].split(MAILTO)[1].trim()),o=e.href,a=new URL(o);var c=new URLSearchParams(a.search);n=c.get("cc"),i=c.get("bcc"),l=c.get("subject"),d=c.get("body")}else t=e.getAttribute("data-address")+"@"+e.getAttribute("data-domain"),o=MAILTO+encodeURIComponent(t),a=new URL(o),n=e.getAttribute("data-cc-address")+"@"+e.getAttribute("data-cc-domain"),i=e.getAttribute("data-bcc-address")+"@"+e.getAttribute("data-bcc-domain"),l=e.getAttribute("data-subject"),d=e.getAttribute("data-body");if(validateEmail(t)){validateEmail(n)||(n=""),validateEmail(i)||(i="");var m=getE("mailgo-title"),r=(getE("mailgo-details"),getE("mailgo-cc")),s=getE("mailgo-cc-value"),p=getE("mailgo-bcc"),g=getE("mailgo-bcc-value"),u=getE("mailgo-subject"),h=getE("mailgo-subject-value"),v=getE("mailgo-body"),C=getE("mailgo-body-value"),E=getE("mailgo-gmail"),y=getE("mailgo-outlook"),f=getE("mailgo-open"),b=getE("mailgo-copy");m.textContent=t,n?(r.style.display="block",s.textContent=n):r.style.display="none",i?(p.style.display="block",g.textContent=i):p.style.display="none",l?(u.style.display="block",h.textContent=l):u.style.display="none",d?(v.style.display="block",C.textContent=d):v.style.display="none",E.addEventListener("click",function(){return actions.openGmail(o)}),y.addEventListener("click",function(){return actions.openOutlook(t,a)});var k=encodeEmail(t);f.addEventListener("click",function(){return actions.openDefault(k)}),b.addEventListener("click",function(){return actions.copy(t,b)}),showMailgo(),e.addEventListener("keydown",function(){return mailgoKeydown(t,a,o,k,b)},!1)}},actions={openGmail:function(e){return window.open("https://mail.google.com/mail?extsrc=mailto&url="+encodeURIComponent(e),"_blank")},openOutlook:function(e,t){return window.open("https://outlook.live.com/owa/?path=/mail/action/compose&to="+encodeURIComponent(e)+t.search.replace(/^[$]/,"&"),"_blank")},openDefault:function(e){return mailToEncoded(e)},copy:function(e,t){copyToClipboard(e),t.textContent="copied",setTimeout(function(){return t.textContent="copy"},999)}},mailgoCheckRender=function(e){document.contains(getE("mailgo"))&&e.path.forEach(function(t){if(t.href&&t.href.toLowerCase().startsWith(MAILTO)&&!t.classList.contains("no-mailgo")||t.href&&"#mailgo"===t.getAttribute("href").toLowerCase()||t.classList.contains("mailgo"))return e.preventDefault(),void mailgoRender(t)})},mailgoKeydown=function(e,t,a,o,n){if(mailgoIsShowing())switch(event.keyCode){case 27:hideMailgo();break;case 71:actions.openGmail(a);break;case 79:actions.openOutlook(e,t);break;case 32:case 13:actions.openDefault(o);break;case 67:actions.copy(e,n);break;default:return}};document.addEventListener("DOMContentLoaded",mailgoInit),document.addEventListener("click",mailgoCheckRender);var validateEmail=function(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)},copyToClipboard=function(e){var t=document.createElement("textarea");t.value=e,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t);var a=document.getSelection().rangeCount>0&&document.getSelection().getRangeAt(0);t.select(),document.execCommand("copy"),document.body.removeChild(t),a&&(document.getSelection().removeAllRanges(),document.getSelection().addRange(a))},showMailgo=function(){return getE("mailgo").style.display="flex"},hideMailgo=function(){return getE("mailgo").style.display="none"},mailgoIsShowing=function(){return"flex"===getE("mailgo").style.display},mailToEncoded=function(e){return window.location.href=MAILTO+atob(e)},encodeEmail=function(e){return btoa(e)},getE=function(e){return document.getElementById(e)};
\ No newline at end of file
+"use strict";var V="0.4.7",MAILTO="mailto:",mailgoCSS=document.createElement("link");mailgoCSS.rel="stylesheet",mailgoCSS.type="text/css",mailgoCSS.href="https://unpkg.com/mailgo@"+V+"/dist/mailgo.min.css",document.head.appendChild(mailgoCSS);var mailgoInit=function(){var e=document.createElement("div");e.id="mailgo",e.classList.add("mailgo-modal"),e.style.display="none";var t=document.createElement("div");t.className="mailgo-modal-background",e.appendChild(t);var a=document.createElement("div");a.className="mailgo-modal-content",e.appendChild(a);var o=document.createElement("strong");o.id="mailgo-title",o.className="mailgo-title",a.appendChild(o);var n=document.createElement("div");n.id="mailgo-details",n.className="mailgo-details";var i=document.createElement("p");i.id="mailgo-cc";var l=document.createElement("span");l.className="mailgo-weight-500";var d=document.createTextNode("cc ");l.appendChild(d);var c=document.createElement("span");c.id="mailgo-cc-value",i.appendChild(l),i.appendChild(c),n.appendChild(i);var m=document.createElement("p");m.id="mailgo-bcc";var r=document.createElement("span");r.className="mailgo-weight-500";var s=document.createTextNode("bcc ");r.appendChild(s);var p=document.createElement("span");p.id="mailgo-bcc-value",m.appendChild(r),m.appendChild(p),n.appendChild(m);var g=document.createElement("p");g.id="mailgo-subject";var u=document.createElement("span");u.className="mailgo-weight-500";var h=document.createTextNode("subject ");u.appendChild(h);var v=document.createElement("span");v.id="mailgo-subject-value",g.appendChild(u),g.appendChild(v),n.appendChild(g);var C=document.createElement("p");C.id="mailgo-body";var E=document.createElement("span");E.className="mailgo-weight-500";var y=document.createTextNode("body ");E.appendChild(y);var b=document.createElement("span");b.id="mailgo-body-value",C.appendChild(E),C.appendChild(b),n.appendChild(C),a.appendChild(n);var f=document.createElement("a");f.id="mailgo-gmail",f.href="#mailgo-gmail",f.classList.add("mailgo-open"),f.classList.add("mailgo-gmail");var k=document.createTextNode("open in ");f.appendChild(k);var L=document.createElement("span");L.className="mailgo-weight-500";var w=document.createTextNode("Gmail");L.appendChild(w),f.appendChild(L),a.appendChild(f);var x=document.createElement("a");x.id="mailgo-outlook",x.href="#mailgo-outlook",x.classList.add("mailgo-open"),x.classList.add("mailgo-outlook");var N=document.createTextNode("open in ");x.appendChild(N);var T=document.createElement("span");T.className="mailgo-weight-500";var A=document.createTextNode("Outlook");T.appendChild(A),x.appendChild(T),a.appendChild(x);var S=document.createElement("a");S.id="mailgo-open",S.href="#mailgo-open",S.classList.add("mailgo-open"),S.classList.add("mailgo-default");var I=document.createElement("span");I.className="mailgo-weight-500";var M=document.createTextNode("open");I.appendChild(M);var R=document.createTextNode(" default");S.appendChild(I),S.appendChild(R),a.appendChild(S);var O=document.createElement("a");O.id="mailgo-copy",O.href="#mailgo-copy",O.classList.add("mailgo-copy"),O.classList.add("mailgo-weight-500");var j=document.createTextNode("copy");O.appendChild(j),a.appendChild(O);var U=document.createElement("a");U.href="https://mailgo.js.org?ref=mailgo-modal",U.className="mailgo-by",U.target="_blank",U.rel="noopener noreferrer";var D=document.createTextNode("mailgo.js.org");U.appendChild(D),a.appendChild(U),document.body.appendChild(e),t.addEventListener("click",hideMailgo)},mailgoRender=function(e){var t="",a="",o="",n="",i="",l="",d="";if(e.href&&e.href.toLowerCase().startsWith(MAILTO)){t=decodeURIComponent(e.href.split("?")[0].split(MAILTO)[1].trim()),o=e.href,a=new URL(o);var c=new URLSearchParams(a.search);n=c.get("cc"),i=c.get("bcc"),l=c.get("subject"),d=c.get("body")}else t=e.getAttribute("data-address")+"@"+e.getAttribute("data-domain"),o=MAILTO+encodeURIComponent(t),a=new URL(o),n=e.getAttribute("data-cc-address")+"@"+e.getAttribute("data-cc-domain"),i=e.getAttribute("data-bcc-address")+"@"+e.getAttribute("data-bcc-domain"),l=e.getAttribute("data-subject"),d=e.getAttribute("data-body");if(validateEmail(t)){validateEmail(n)||(n=""),validateEmail(i)||(i="");var m=getE("mailgo-title"),r=(getE("mailgo-details"),getE("mailgo-cc")),s=getE("mailgo-cc-value"),p=getE("mailgo-bcc"),g=getE("mailgo-bcc-value"),u=getE("mailgo-subject"),h=getE("mailgo-subject-value"),v=getE("mailgo-body"),C=getE("mailgo-body-value"),E=getE("mailgo-gmail"),y=getE("mailgo-outlook"),b=getE("mailgo-open"),f=getE("mailgo-copy");m.textContent=t,n?(r.style.display="block",s.textContent=n):r.style.display="none",i?(p.style.display="block",g.textContent=i):p.style.display="none",l?(u.style.display="block",h.textContent=l):u.style.display="none",d?(v.style.display="block",C.textContent=d):v.style.display="none",E.addEventListener("click",function(){return actions.openGmail(o)}),y.addEventListener("click",function(){return actions.openOutlook(t,a)});var k=encodeEmail(t);b.addEventListener("click",function(){return actions.openDefault(k)}),f.addEventListener("click",function(){return actions.copy(t,f)}),showMailgo(),e.addEventListener("keydown",function(){return mailgoKeydown(t,a,o,k,f)},!1)}},actions={openGmail:function(e){var t="https://mail.google.com/mail?extsrc=mailto&url="+encodeURIComponent(e);window.open(t,"_blank")},openOutlook:function(e,t,a){var o="https://outlook.live.com/owa/?path=/mail/action/compose&to="+encodeURIComponent(e);""!=a&&(o=o+"&subject="+a),""!=t&&(o=o+"&body="+t),window.open(o,"_blank")},openDefault:function(e){mailToEncoded(e)},copy:function(e,t){copyToClipboard(e),t.textContent="copied",setTimeout(function(){return t.textContent="copy"},999)}},isMailgo=function(e){return e.href&&e.href.toLowerCase().startsWith(MAILTO)&&!e.classList.contains("no-mailgo")||e.href&&"#mailgo"===e.getAttribute("href").toLowerCase()||e.classList.contains("mailgo")},mailgoCheckRender=function(t){if(document.contains(getE("mailgo")))return t.path.some(isMailgo)?(t.preventDefault(),void mailgoRender(e)):void 0},mailgoKeydown=function(e,t,a,o,n){if(mailgoIsShowing())switch(event.keyCode){case 27:hideMailgo();break;case 71:actions.openGmail(a);break;case 79:actions.openOutlook(e,t);break;case 32:case 13:actions.openDefault(o);break;case 67:actions.copy(e,n);break;default:return}};document.addEventListener("DOMContentLoaded",mailgoInit),document.addEventListener("click",mailgoCheckRender);var validateEmail=function(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)},copyToClipboard=function(e){var t=document.createElement("textarea");t.value=e,t.setAttribute("readonly",""),t.style.position="absolute",t.style.left="-9999px",document.body.appendChild(t);var a=document.getSelection().rangeCount>0&&document.getSelection().getRangeAt(0);t.select(),document.execCommand("copy"),document.body.removeChild(t),a&&(document.getSelection().removeAllRanges(),document.getSelection().addRange(a))},showMailgo=function(){return getE("mailgo").style.display="flex"},hideMailgo=function(){return getE("mailgo").style.display="none"},mailgoIsShowing=function(){return"flex"===getE("mailgo").style.display},mailToEncoded=function(e){return window.location.href=MAILTO+atob(e)},encodeEmail=function(e){return btoa(e)},getE=function(e){return document.getElementById(e)};
\ No newline at end of file
diff --git a/src/mailgo.js b/src/mailgo.js
index 2166942..3605dac 100644
--- a/src/mailgo.js
+++ b/src/mailgo.js
@@ -296,22 +296,27 @@ const mailgoRender = mailgo => {
// actions
const actions = {
- openGmail: mailtoHref =>
- window.open(
+ openGmail: mailtoHref => {
+ let gmailUrl =
"https://mail.google.com/mail?extsrc=mailto&url=" +
- encodeURIComponent(mailtoHref),
- "_blank"
- ),
+ encodeURIComponent(mailtoHref);
- openOutlook: (mail, url) =>
- window.open(
+ window.open(gmailUrl, "_blank");
+ },
+
+ openOutlook: (mail, bodyMail, subject) => {
+ let outlookUrl =
"https://outlook.live.com/owa/?path=/mail/action/compose&to=" +
- encodeURIComponent(mail) +
- url.search.replace(/^[$]/, "&"),
- "_blank"
- ),
+ encodeURIComponent(mail);
+ if (subject != "") outlookUrl = outlookUrl + "&subject=" + subject;
+ if (bodyMail != "") outlookUrl = outlookUrl + "&body=" + bodyMail;
- openDefault: encEmail => mailToEncoded(encEmail),
+ window.open(outlookUrl, "_blank");
+ },
+
+ openDefault: encEmail => {
+ mailToEncoded(encEmail);
+ },
copy: (mail, copyButton) => {
copyToClipboard(mail);
@@ -320,6 +325,17 @@ const actions = {
}
};
+// function that returns if an element is a mailgo
+const isMailgo = element =>
+ // first case: it is an element with "mailto:..." in href and no no-mailgo in classList
+ (element.href &&
+ element.href.toLowerCase().startsWith(MAILTO) &&
+ !element.classList.contains("no-mailgo")) ||
+ // second case: the href=#mailgo
+ (element.href && element.getAttribute("href").toLowerCase() === "#mailgo") ||
+ // third case: the classList contains mailgo
+ element.classList.contains("mailgo");
+
/**
* mailgoCheckRender
* function to check if an element is mailgo-enabled or not referencing to the old
@@ -332,26 +348,15 @@ const mailgoCheckRender = event => {
if (!document.contains(getE("mailgo"))) return;
// go in the event.path to find if the user has clicked on a mailgo element
- event.path.forEach(e => {
- if (
- // first case: it is an element with "mailto:..." in href and no no-mailgo in classList
- (e.href &&
- e.href.toLowerCase().startsWith(MAILTO) &&
- !e.classList.contains("no-mailgo")) ||
- // second case: the href=#mailgo
- (e.href && e.getAttribute("href").toLowerCase() === "#mailgo") ||
- // third case: the classList contains mailgo
- e.classList.contains("mailgo")
- ) {
- // stop the normal execution of the element click
- event.preventDefault();
+ if (event.path.some(isMailgo)) {
+ // stop the normal execution of the element click
+ event.preventDefault();
- // render mailgo
- mailgoRender(e);
+ // render mailgo
+ mailgoRender(e);
- return;
- }
- });
+ return;
+ }
return;
};