From 2b46e09d276abd270767ce6d9bf601357408140e Mon Sep 17 00:00:00 2001
From: Andrew Van Tassel <avantassel@gmail.com>
Date: Tue, 1 Mar 2011 22:51:31 -0700
Subject: [PATCH] Added Preferences for default map and units, fixed private IP
 display message

---
 chrome/content/images/mailhops32.png | Bin 3738 -> 3898 bytes
 chrome/content/mailWindowOverlay.xul |   2 +-
 chrome/content/mailhops.js           |  83 +++++++++++++++++++++++++--
 install.rdf                          |   4 +-
 4 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/chrome/content/images/mailhops32.png b/chrome/content/images/mailhops32.png
index d92b95f6adfb55cd6768232258c6bfcf7511c8dc..9572c42a6597cb912fd19278a8c4ab2266372281 100644
GIT binary patch
delta 3111
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
BF(d#0

delta 2949
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

diff --git a/chrome/content/mailWindowOverlay.xul b/chrome/content/mailWindowOverlay.xul
index 18e5328..4867441 100644
--- a/chrome/content/mailWindowOverlay.xul
+++ b/chrome/content/mailWindowOverlay.xul
@@ -12,7 +12,7 @@
 		<row id="mailhops" collapsed="false">
 			<label id="mailhopsLabel" value="route " class="headerName"/>
                		<hbox id="mailhopsResult" flex="2">
-               			<image id="mailhopsResultImage" tooltiptext="Click to view the travel map of this message." width="16" height="16"/>
+               			<image id="mailhopsResultImage" tooltiptext="Click to view the travel map of this message." width="16" height="11"/>
                			<hbox id="mailhopsResultText"/>
                		</hbox>
 		</row>
diff --git a/chrome/content/mailhops.js b/chrome/content/mailhops.js
index dc66747..71c3b6c 100644
--- a/chrome/content/mailhops.js
+++ b/chrome/content/mailhops.js
@@ -16,7 +16,9 @@ var mailHops =
   resultImage:	null,
   resultText:	null,
   container:	null,
-  isLoaded:      false
+  isLoaded:     false,
+  map:			'goog',
+  unit:			'mi'
 }
 
 mailHops.startLoading = function()
@@ -26,6 +28,10 @@ mailHops.startLoading = function()
   mailHops.resultBox = document.getElementById ( "mailhopsResult" ) ;
   mailHops.resultImage = document.getElementById ( "mailhopsResultImage" ) ;  
   mailHops.resultText = document.getElementById ( "mailhopsResultText" ) ;
+  //get preferences
+  mailHops.map = mailHops.getCharPref('mail.mailHops.map','goog');
+  mailHops.unit = mailHops.getCharPref('mail.mailHops.unit','mi');
+  
 } ;
 
 mailHops.StreamListener =
@@ -155,13 +161,20 @@ mailHops.testIP = function(ip,header){
 mailHops.displayResult = function ( distance, image, city, state, route )
 {
   if(distance){
-    if(distance.miles > 0)
-		mailHops.resultText.textContent = city+', '+state+' ( '+Math.round(distance.miles)+' miles to you )';
-	else
+    if(distance.miles > 0){
+    	if(mailHops.unit=='mi')
+			mailHops.resultText.textContent = city+', '+state+' ( '+addCommas(Math.round(distance.miles))+' mi traveled )';
+		else
+			mailHops.resultText.textContent = city+', '+state+' ( '+addCommas(Math.round(distance.kilometers))+' km traveled )';
+	}
+	else if(city && state)
 		mailHops.resultText.textContent = city+', '+state;
+	else
+		mailHops.resultText.textContent = ' Local message.';
 	mailHops.container.setAttribute("onclick","launchMap('"+route.toString()+"');");
   } else {
   	mailHops.resultText.textContent = ' There was a problem.'; 
+  	mailHops.container.removeAttribute("onclick");
   }
   mailHops.resultImage.src=image; 
 } ;
@@ -178,6 +191,7 @@ mailHops.setupEventListener = function()
   }
 
   mailHops.startLoading() ;
+  mailHops.registerObserver() ;
  
   var listener = {} ;
   listener.onStartHeaders = function() { mailHops.clearRoute() ; } ;
@@ -185,6 +199,50 @@ mailHops.setupEventListener = function()
   gMessageListeners.push ( listener ) ;
 } ;
 
+//preferences observers
+mailHops.registerObserver = function()
+{
+  var prefService = Components.classes["@mozilla.org/preferences-service;1"].getService ( Components.interfaces.nsIPrefService ) ;
+  mailHops._branch = prefService.getBranch ( "mail.mailHops." ) ;
+  mailHops._branch.QueryInterface ( Components.interfaces.nsIPrefBranchInternal ) ;
+  mailHops._branch.addObserver ( "" , mailHops , false ) ;
+} ;
+
+mailHops.unregisterObserver = function()
+{
+  if ( !mailHops._branch ){
+    return ;
+  }
+
+  mailHops._branch.removeObserver ( "" , mailHops ) ;
+} ;
+
+mailHops.observe = function ( aSubject , aTopic , aData )
+{
+  if ( aTopic != "nsPref:changed" ){
+    return ;
+  }
+
+  mailHops.startLoading();
+} ;
+
+mailHops.getCharPref = function ( strName , strDefault )
+{
+  var value;
+
+  try
+  {
+    value = pref.getCharPref ( strName ) ;
+  }
+  catch ( exception )
+  {
+    value = strDefault ;
+  }
+
+  return ( value ) ;
+} ;
+
+//mailhops lookup
 mailHops.lookup = function(route){
 
  //setup loading
@@ -202,7 +260,7 @@ mailHops.lookup = function(route){
    var data = nativeJSON.decode(xmlhttp.responseText);
    if(data && data.meta.code==200){
    	for(var i=0; i<data.response.route.length;i++){
-   		if(!data.response.route[i].local){
+   		if(!data.response.route[i].private && !data.response.route[i].client){
    			if(data.response.route[i].countryCode)
 	   			flag='chrome://mailhops/content/images/flags/'+data.response.route[i].countryCode.toLowerCase()+'.png';
    			city=data.response.route[i].city;
@@ -222,10 +280,23 @@ mailHops.lookup = function(route){
 
 };
 
+function addCommas(nStr)
+{
+	nStr += '';
+	x = nStr.split('.');
+	x1 = x[0];
+	x2 = x.length > 1 ? '.' + x[1] : '';
+	var rgx = /(\d+)(\d{3})/;
+	while (rgx.test(x1)) {
+		x1 = x1.replace(rgx, '$1' + ',' + '$2');
+	}
+	return x1 + x2;
+}
+
 function launchMap(route)
 {
 	//launch mailhops api map
-	var openwin = window.openDialog('http://api.mailhops.com/v1/map/?tb&route='+route,"MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=730,height=330');
+	var openwin = window.openDialog('http://api.mailhops.com/v1/map/?tb&m='+mailHops.map+'&u='+mailHops.unit+'&r='+route,"MailHops",'toolbar=no,location=no,directories=no,menubar=yes,scrollbars=yes,close=yes,width=730,height=330');
 	openwin.focus();
 }
 
diff --git a/install.rdf b/install.rdf
index 8f1df9d..1747d39 100644
--- a/install.rdf
+++ b/install.rdf
@@ -8,7 +8,7 @@
 		<em:type>2</em:type>
 
 		<em:name>MailHops</em:name>
-		<em:version>0.1</em:version>
+		<em:version>0.2</em:version>
 		<em:description>MailHops maps the route an email took to get to you.</em:description>
 		
 		<em:iconURL>chrome://mailhops/content/images/mailhops32.png</em:iconURL>
@@ -17,6 +17,8 @@
 		<em:creator>Andrew Van Tassel</em:creator>
 		<em:developer>Andrew Van Tassel</em:developer>
 
+		<em:optionsURL>chrome://mailhops/content/preferences.xul</em:optionsURL>
+
 		<em:targetApplication resource="rdf:Thunderbird"/>
 	</Description>