1
0
mirror of https://github.com/MailHops/mailhops-plugin.git synced 2025-05-18 07:10:09 -07:00

Fixed message account bubble

This commit is contained in:
Andrew Van Tassel 2017-07-18 11:40:07 -06:00
parent 3c8edf0c22
commit 128291eb12
6 changed files with 22 additions and 21 deletions

View File

@ -1,5 +1,10 @@
# Change Log # Change Log
## 3.1.2 - 2017-07-18
### Fixed
- Account Message Bubble
## 3.1.1 - 2017-07-15 ## 3.1.1 - 2017-07-15
### Added ### Added

View File

@ -9,7 +9,7 @@ var mailHops =
msgURI: null, msgURI: null,
isLoaded: false, isLoaded: false,
options: { options: {
'version':'MailHops Plugin 3.1.1', 'version':'MailHops Plugin 3.1.2',
'lan':'en', 'lan':'en',
'unit':'mi', 'unit':'mi',
'api_http':'https://', 'api_http':'https://',

View File

@ -9,8 +9,7 @@ var mailHopsDisplay =
mailhopsDataPaneDNSBL: null, mailhopsDataPaneDNSBL: null,
mailhopsResultWeather: null, mailhopsResultWeather: null,
mailhopsUnsubscribe: null, mailhopsUnsubscribe: null,
mailHopsMessage: null, mailHopsAccountMessage: null,
mailHopsMessageText: null,
mhBox: null, mhBox: null,
options: null, options: null,
@ -23,8 +22,7 @@ var mailHopsDisplay =
this.mailhopsResultWeather = document.getElementById("mailhopsResultWeather"); this.mailhopsResultWeather = document.getElementById("mailhopsResultWeather");
this.mailhopsUnsubscribe = document.getElementById("mailhopsUnsubscribe"); this.mailhopsUnsubscribe = document.getElementById("mailhopsUnsubscribe");
this.resultDetails = document.getElementById("mailhopsDataPaneDetails"); this.resultDetails = document.getElementById("mailhopsDataPaneDetails");
this.mailHopsMessage = document.getElementById("mailHopsMessage"); this.mailHopsAccountMessage = document.getElementById("mailHopsAccountMessage");
this.mailHopsMessageText = document.getElementById("mailHopsMessageText");
//auth //auth
this.mailhopsDataPaneSPF = document.getElementById("mailhopsDataPaneSPF"); this.mailhopsDataPaneSPF = document.getElementById("mailhopsDataPaneSPF");
@ -52,8 +50,9 @@ var mailHopsDisplay =
mailHopsUtils.launchExternalURL(this.getAttribute('href')); mailHopsUtils.launchExternalURL(this.getAttribute('href'));
}); });
this.mailHopsMessageText.addEventListener("click", function () { this.mailHopsAccountMessage.addEventListener("click", function () {
mailHopsUtils.launchExternalURL(this.getAttribute('href')); mailHopsUtils.launchExternalURL(this.getAttribute('href'));
this.style.display = 'none';
}); });
this.mailhopsUnsubscribe.addEventListener("click", function () { this.mailhopsUnsubscribe.addEventListener("click", function () {
@ -214,6 +213,7 @@ var mailHopsDisplay =
this.mailhopsResultWeather.style.display = 'none'; this.mailhopsResultWeather.style.display = 'none';
this.resultText.removeAttribute('data-route'); this.resultText.removeAttribute('data-route');
this.resultText.style.backgroundImage = ''; this.resultText.style.backgroundImage = '';
this.mailHopsAccountMessage.style.display = 'none';
//remove child details //remove child details
while(this.resultDetails.firstChild) { while(this.resultDetails.firstChild) {
this.resultDetails.removeChild(this.resultDetails.firstChild); this.resultDetails.removeChild(this.resultDetails.firstChild);
@ -346,8 +346,9 @@ var mailHopsDisplay =
this.mailhopsResultWeather.setAttribute('href','https://darksky.net/forecast/'+weatherRoute.lat+','+weatherRoute.lng); this.mailhopsResultWeather.setAttribute('href','https://darksky.net/forecast/'+weatherRoute.lat+','+weatherRoute.lng);
} }
if(image.indexOf('local')!=-1) { if(image.indexOf('local') !== -1) {
displayText = ' Local message.'; displayText = ' Local message.';
this.mailHopsAccountMessage.style.display = 'none';
} else { } else {
if(!!first){ if(!!first){
@ -387,13 +388,13 @@ var mailHopsDisplay =
this.resultText.style.backgroundImage = 'url('+image+')'; this.resultText.style.backgroundImage = 'url('+image+')';
if(meta && meta.message){ if(meta && meta.message){
this.mailHopsMessage.style.display = 'inline'; this.mailHopsAccountMessage.style.display = 'inline';
if(meta.message.text) if(meta.message.text)
this.mailHopsMessageText.value = meta.message.text; this.mailHopsAccountMessage.value = meta.message.text;
if(meta.message.url) if(meta.message.url)
this.mailHopsMessageText.setAttribute('href', meta.message.url); this.mailHopsAccountMessage.setAttribute('href', meta.message.url);
} else { } else {
this.mailHopsMessage.style.display = 'none'; this.mailHopsAccountMessage.style.display = 'none';
} }
}, //end route }, //end route

View File

@ -14,9 +14,8 @@
<rows id="msgNotificationBar"> <rows id="msgNotificationBar">
<row id="mailhopsNoficationBox" collapsed="false"> <row id="mailhopsNoficationBox" collapsed="false">
<image id="mailhopsLogo" src="chrome://mailhops/content/images/mailhops32.png" width="32" height="32" tooltiptext="&mailhops_route_nav_options_label;"/> <image id="mailhopsLogo" src="chrome://mailhops/content/images/mailhops32.png" width="32" height="32" tooltiptext="&mailhops_route_nav_options_label;"/>
<div id="mailHopsMessage">
<label id="mailHopsMessageText" class="bar-link" value="Join today for metrics and more."></label> <label id="mailHopsAccountMessage" class="bar-link" value="Join today"></label>
</div>
<hbox id="mailhopsResult" flex="1"> <hbox id="mailhopsResult" flex="1">

View File

@ -90,15 +90,11 @@
filter: none; filter: none;
} }
#mailHopsMessage { #mailHopsAccountMessage {
z-index:10; z-index:10;
border-radius: 10px; border-radius: 10px;
display: none; display: none;
position: absolute;
padding: 10px; padding: 10px;
margin-top:40px;
margin-left: -28px;
width: auto;
border: 1px solid #CCC; border: 1px solid #CCC;
color: #777; color: #777;
background-color: #FFF; background-color: #FFF;

View File

@ -5,7 +5,7 @@
<Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<em:type>2</em:type> <em:type>2</em:type>
<em:id>thunderbird@mailhops.com</em:id> <em:id>thunderbird@mailhops.com</em:id>
<em:version>3.1.1</em:version> <em:version>3.1.2</em:version>
<em:name>MailHops</em:name> <em:name>MailHops</em:name>
<em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description> <em:description>MailHops maps the route an email took to get to you. Displaying the senders location, weather, user-agent and authentication used.</em:description>