0
@@ -91,50 +91,13 @@ cosmo.util.encoding.fromBase64 = function(string){
0
     } while (i < string.length);
0
 
0
     return cosmo.util.encoding._utf8_decode(out);
0
-}
0
-/* UTF-8 functions grabbed from http://www.webtoolkit.info/javascript-base64.html */
0
-cosmo.util.encoding._utf8_decode = function (utftext) {  
0
-    var string = "";  
0
-    var i = 0;  
0
-    var c = c1 = c2 = 0;  
0
-         while ( i < utftext.length ) {  
0
-             c = utftext.charCodeAt(i);  
0
-             if (c < 128) {  
0
-            string += String.fromCharCode(c);  
0
-            i++;  
0
-        }  
0
-        else if((c > 191) && (c < 224)) {  
0
-            c2 = utftext.charCodeAt(i+1);  
0
-            string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));  
0
-            i += 2;  
0
-        }  
0
-        else {  
0
-            c2 = utftext.charCodeAt(i+1);  
0
-            c3 = utftext.charCodeAt(i+2);  
0
-            string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));  
0
-            i += 3;  
0
-        }  
0
-         }  
0
-         return string;  
0
-}  
0
-
0
-cosmo.util.encoding._utf8_encode = function (string) {  
0
-    string = string.replace(/\r\n/g,"\n");  
0
-    var utftext = "";  
0
-         for (var n = 0; n < string.length; n++) {  
0
-             var c = string.charCodeAt(n);  
0
-             if (c < 128) {  
0
-            utftext += String.fromCharCode(c);  
0
-        }  
0
-        else if((c > 127) && (c < 2048)) {  
0
-            utftext += String.fromCharCode((c >> 6) | 192);  
0
-            utftext += String.fromCharCode((c & 63) | 128);  
0
-        }  
0
-        else {  
0
-            utftext += String.fromCharCode((c >> 12) | 224);  
0
-            utftext += String.fromCharCode(((c >> 6) & 63) | 128);  
0
-            utftext += String.fromCharCode((c & 63) | 128);  
0
-        }  
0
-         }  
0
-         return utftext;  
0
-} 
0
+};
0
+
0
+/* UTF-8 conversion functions per http://ecmanaut.blogspot.com/2006/07/encoding-decoding-utf8-in-javascript.html */
0
+cosmo.util.encoding._utf8_encode = function(s) {
0
+    return unescape(encodeURIComponent(s));
0
+};
0
+
0
+cosmo.util.encoding._utf8_decode = function(s) {
0
+  return decodeURIComponent(escape(s));
0
+};