From 811e5474313fc8fc959bee1a58e51c4c55f350ec Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 24 Dec 2009 10:44:53 -0500 Subject: Proper JavaScript-side URI escaping/de-escaping; fix C-side URL encoding of big characters --- lib/js/urweb.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/js') diff --git a/lib/js/urweb.js b/lib/js/urweb.js index 15c9df7e..bd575cc9 100644 --- a/lib/js/urweb.js +++ b/lib/js/urweb.js @@ -583,8 +583,7 @@ function pflo(s) { function uf(s) { if (s.length == 0) return "_"; - return (s.charAt(0) == '_' ? "_" : "") - + escape(s).replace(new RegExp ("/", "g"), "%2F").replace(new RegExp ("\\+", "g"), "%2B"); + return (s.charAt(0) == '_' ? "_" : "") + encodeURIComponent(s); } function uu(s) { @@ -592,7 +591,7 @@ function uu(s) { s = s.substring(1); } else if (s.length >= 3 && s.charAt(0) == '%' && s.charAt(1) == '5' && (s.charAt(2) == 'f' || s.charAt(2) == 'F')) s = s.substring(3); - return unescape(s.replace(new RegExp ("\\+", "g"), " ")); + return decodeURIComponent(s.replace(new RegExp ("\\+", "g"), " ")); } function ub(b) { -- cgit v1.2.3