From 1cd0d2bb31bfa4ceb760ae08150cfa217ace398f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Thu, 1 Mar 2018 09:01:56 +0700
Subject: [PATCH] Recent change from escape/unescape to encodeURI/decodeURI
 should have been to encodeURIComponent/decodeURIComponent

---
 web/source/kmwcallback.ts | 4 ++--
 web/source/kmwutils.ts    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/source/kmwcallback.ts b/web/source/kmwcallback.ts
index f42446c44c..167fe21441 100644
--- a/web/source/kmwcallback.ts
+++ b/web/source/kmwcallback.ts
@@ -1108,7 +1108,7 @@ class KeyboardInterface {
     this.resetContextCache();
     var cName='KeymanWeb_'+kbdName+'_Option_'+storeName,cValue=this.keymanweb.util.loadCookie(cName);
     if(typeof cValue[storeName] != 'undefined') {
-      return decodeURI(cValue[storeName]);
+      return decodeURIComponent(cValue[storeName]);
     } else {
       return dfltValue;
     }
@@ -1128,7 +1128,7 @@ class KeyboardInterface {
       return false;
     }
     
-    var cName='KeymanWeb_'+kbd['KI']+'_Option_'+storeName, cValue=encodeURI(optValue);
+    var cName='KeymanWeb_'+kbd['KI']+'_Option_'+storeName, cValue=encodeURIComponent(optValue);
 
     this.keymanweb.util.saveCookie(cName,cValue);
     return true;
diff --git a/web/source/kmwutils.ts b/web/source/kmwutils.ts
index dba82fbea2..2dea991924 100644
--- a/web/source/kmwutils.ts
+++ b/web/source/kmwutils.ts
@@ -747,7 +747,7 @@ class Util {
       var cx = this.loadCookie();
       for(var t in cx) {
         if(t == cn) {
-          var d = decodeURI(cx[t]).split(';');
+          var d = decodeURIComponent(cx[t]).split(';');
           for(var i=0; i<d.length; i++) {
             var xc = d[i].split('=');
             if(xc.length > 1) {
@@ -785,7 +785,7 @@ class Util {
     }
 
     var d = new Date(new Date().valueOf() + 1000 * 60 * 60 * 24 * 30).toUTCString();
-    document.cookie = cn+'='+encodeURI(s)+'; path=/; expires='+d;//Fri, 31 Dec 2099 23:59:59 GMT;';
+    document.cookie = cn+'='+encodeURIComponent(s)+'; path=/; expires='+d;//Fri, 31 Dec 2099 23:59:59 GMT;';
   }
   
   /**