From 7e9633307446ab2616bb9c14cfc12999a75ac6af Mon Sep 17 00:00:00 2001 From: Andrew Van Tassel Date: Fri, 23 Aug 2013 11:25:14 -0600 Subject: [PATCH] removed xpi files --- chrome/content/mailhops.js | 47 ++++++++++++++-------- chrome/content/mailhopsMap.xul | 2 +- chrome/content/msgHdrViewOverlay.xul | 3 +- chrome/content/preferences.js | 58 +++++++++++++++++++-------- chrome/content/preferences.xul | 19 +++++---- install.rdf | 2 +- mailhops-0.4.5-pb.xpi | Bin 118500 -> 0 bytes mailhops-0.4.6-pb.xpi | Bin 118673 -> 0 bytes mailhops-0.4.6-tb.xpi | Bin 118528 -> 0 bytes mailhops-0.4.7-pb.xpi | Bin 120484 -> 0 bytes mailhops-0.4.8-pb.xpi | Bin 120644 -> 0 bytes mailhops-0.5-pb.xpi | Bin 130423 -> 0 bytes mailhops-0.6-pb.xpi | Bin 135848 -> 0 bytes mailhops-0.6.1-pb.xpi | Bin 136156 -> 0 bytes mailhops-0.6.2-pb.xpi | Bin 136237 -> 0 bytes mailhops-0.6.3-pb.xpi | Bin 136250 -> 0 bytes mailhops-0.6.4-pb.xpi | Bin 137237 -> 0 bytes mailhops-0.6.5-pb.xpi | Bin 138453 -> 0 bytes mailhops-0.6.6-pb.xpi | Bin 138657 -> 0 bytes mailhops-0.6.7-pb.xpi | Bin 138721 -> 0 bytes mailhops-0.6.8-pb.xpi | Bin 138709 -> 0 bytes mailhops-0.6.9-pb.xpi | Bin 138721 -> 0 bytes mailhops-0.6.9.1-pb.xpi | Bin 138728 -> 0 bytes mailhops-0.6.9.2-pb.xpi | Bin 138815 -> 0 bytes mailhops-0.6.9.3-pb.xpi | Bin 139144 -> 0 bytes mailhops-0.7-pb.xpi | Bin 140818 -> 0 bytes mailhops-0.7.1-pb.xpi | Bin 140464 -> 0 bytes mailhops-0.7.xpi | Bin 140818 -> 0 bytes mailhops-0.8-pb.xpi | Bin 141424 -> 0 bytes 29 files changed, 87 insertions(+), 44 deletions(-) delete mode 100644 mailhops-0.4.5-pb.xpi delete mode 100644 mailhops-0.4.6-pb.xpi delete mode 100644 mailhops-0.4.6-tb.xpi delete mode 100644 mailhops-0.4.7-pb.xpi delete mode 100644 mailhops-0.4.8-pb.xpi delete mode 100644 mailhops-0.5-pb.xpi delete mode 100644 mailhops-0.6-pb.xpi delete mode 100644 mailhops-0.6.1-pb.xpi delete mode 100644 mailhops-0.6.2-pb.xpi delete mode 100644 mailhops-0.6.3-pb.xpi delete mode 100644 mailhops-0.6.4-pb.xpi delete mode 100644 mailhops-0.6.5-pb.xpi delete mode 100644 mailhops-0.6.6-pb.xpi delete mode 100644 mailhops-0.6.7-pb.xpi delete mode 100644 mailhops-0.6.8-pb.xpi delete mode 100644 mailhops-0.6.9-pb.xpi delete mode 100644 mailhops-0.6.9.1-pb.xpi delete mode 100644 mailhops-0.6.9.2-pb.xpi delete mode 100644 mailhops-0.6.9.3-pb.xpi delete mode 100644 mailhops-0.7-pb.xpi delete mode 100644 mailhops-0.7.1-pb.xpi delete mode 100644 mailhops-0.7.xpi delete mode 100644 mailhops-0.8-pb.xpi diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js index 27e0094..3f1de64 100644 --- a/chrome/content/mailhops.js +++ b/chrome/content/mailhops.js @@ -21,12 +21,11 @@ var mailHops = mailhopsListContainer: null, mailhopsAuthContainer: null, resultListDataPane: null, - resultMeta: null, isLoaded: false, options: {'map':'goog','unit':'mi','api_url':'http://api.mailhops.com'}, - appVersion: 'MailHops Postbox 0.8', + appVersion: 'MailHops Postbox 0.8.2', message: {secure:[]}, client_location: null } @@ -65,6 +64,7 @@ mailHops.init = function() mailHops.launchMap(String(this.getAttribute("data-route"))); } , false); + mailHops.resultDetailsLink.addEventListener("click", function () { if(mailHops.resultContainerDetails.style.display=='none'){ mailHops.resultContainerDetails.style.display = 'block'; @@ -87,6 +87,11 @@ mailHops.init = function() window.openDialog("chrome://mailhops/content/preferences.xul","mailHopsPreferences",null,null); } , false); + + document.getElementById("mailhopsDataPaneRefreshLink").addEventListener("click", function () { + mailHops.refreshCache(); + } + , false); }; mailHops.loadPref = function() @@ -563,7 +568,7 @@ mailHops.displayResult = function ( header_route, response, meta, lookup_url ){ mailHops.resultDetails.removeChild(mailHops.resultDetails.firstChild); } - //append meta + //append meta if(mailHops.options.show_meta){ document.getElementById('dataPaneMailHopsMetaContainer').style.display=''; while(mailHops.resultMeta.firstChild) { @@ -582,7 +587,7 @@ mailHops.displayResult = function ( header_route, response, meta, lookup_url ){ } else { document.getElementById('dataPaneMailHopsMetaContainer').style.display='none'; - } + } if(response && response.route && response.route.length > 0){ @@ -904,24 +909,25 @@ mailHops.lookupRoute = function(header_route){ //import nativeJSON var nativeJSON = Components.classes["@mozilla.org/dom/json;1"].createInstance(Components.interfaces.nsIJSON); - - //check for cache - var cached_results=mailHops.getResults(); - - if(cached_results){ - cached_results = JSON.parse(cached_results); - mailHops.displayResult(header_route,cached_results.response); - return; - } - - //call mailhops api for lookup - var xmlhttp = new XMLHttpRequest(); + var lookupURL=mailHops.options.api_url+'/v1/lookup/?pb&app='+mailHops.appVersion+'&r='+String(header_route); if(mailHops.options.show_weather) lookupURL+='&w=1'; if(mailHops.options.client_location != '') lookupURL+='&c=0'; + + //check for cache + var cached_results=mailHops.getResults(); + + if(cached_results){ + cached_results = JSON.parse(cached_results); + mailHops.displayResult(header_route, cached_results.response, cached_results.meta, lookupURL); + return; + } + + //call mailhops api for lookup + var xmlhttp = new XMLHttpRequest(); xmlhttp.open("GET", lookupURL ,true); xmlhttp.onreadystatechange=function() { @@ -929,6 +935,8 @@ mailHops.lookupRoute = function(header_route){ try{ var data = JSON.parse(xmlhttp.responseText); if(data && data.meta.code==200){ + var d = new Date(); + data.meta.cached = d.toISOString(); //save the result mailHops.saveResults(JSON.stringify(data)); //display the result @@ -973,7 +981,7 @@ mailHops.launchMap = function(route){ if(mailHops.options.show_weather) lookupURL+='&w=1'; - window.openDialog("chrome://mailhops/content/mailhopsMap.xul","MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=742,height=385', {src: lookupURL}); + window.openDialog("chrome://mailhops/content/mailhopsMap.xul","MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=742,height=385,resizable=yes', {src: lookupURL}); } }; @@ -1006,4 +1014,9 @@ mailHops.getResults = function(){ return msgHdr.getStringProperty( "MH-Route" ); }; +mailHops.refreshCache = function(){ + mailHops.saveResults(''); + mailHops.getRoute(); +}; + addEventListener ( "messagepane-loaded" , mailHops.setupEventListener , true ) ; diff --git a/chrome/content/mailhopsMap.xul b/chrome/content/mailhopsMap.xul index dcd8b64..14119a9 100644 --- a/chrome/content/mailhopsMap.xul +++ b/chrome/content/mailhopsMap.xul @@ -10,7 +10,7 @@ title="MailHops Map" buttonlabelcancel="Close"> -