From 9ad85b94399ad653e1d10fd18500a9e2205f032d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Aug 2009 11:30:30 +0100
Subject: [PATCH] AJAX route validator fixes

---
 yarrg/web/pirate-route    | 4 ++--
 yarrg/web/routetextstring | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index e414e6e..612c577 100644
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -82,7 +82,7 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  abbreviations are OK):<br/>
 
 <script type="text/javascript">
-tr_uri= "routetextstring?format=json"
+tr_uri= "routetextstring?format=json&type=text/xml"
 		+ "&ocean=<% uri_escape($a{Ocean}) %>";
 
 tr_timeout=false;
@@ -125,7 +125,7 @@ function tr_Ready() {
 
 <input type="text" name="routestring" size=80
  onchange="tr_element= event.currentTarget; tr_Needed();"
- onkeydown="tr_element= event.currentTarget; tr_Later();"><br>
+ onkeyup="tr_element= event.currentTarget; tr_Later();"><br>
 <div name="routeresults">&nbsp;</div><br/>
 
 % } else {
diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index c39d48b..4202ce9 100644
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -29,7 +29,8 @@ if ($format =~ 'json') {
 	$r->content_type($ctype or $format);
 	$output= sub { print to_json({
 		success => 1,
-		show => encode_entities($canontext),
+		show => length $canontext ? encode_entities($canontext)
+			: '&nbsp;',
 	})};
 	$output_wrong= sub { print to_json({
 		success => 0,
-- 
2.30.2