Merge remote-tracking branch 'upstream/develop' into fix/installation-guide-update

Author: vulongphan

client/i18n.js

@@ -37,8 +37,6 @@ const options = {
   allowMultiLoading: false, // set loadPath: '/locales/resources.json?lng={{lng}}&ns={{ns}}' to adapt to multiLoading
 };
 
-console.log('options', options);
-
 i18n
   .use(initReactI18next) // pass the i18n instance to react-i18next.
   // .use(LanguageDetector)// to detect the language from currentBrowser

client/modules/IDE/actions/uploader.js

@@ -31,6 +31,14 @@ function localIntercept(file, options = {}) {
   });
 }
 
+function toBinary(string) {
+  const codeUnits = new Uint16Array(string.length);
+  for (let i = 0; i < codeUnits.length; i += 1) {
+    codeUnits[i] = string.charCodeAt(i);
+  }
+  return String.fromCharCode(...new Uint8Array(codeUnits.buffer));
+}
+
 export function dropzoneAcceptCallback(userId, file, done) {
   return () => {
     // if a user would want to edit this file as text, local interceptor
@@ -93,9 +101,12 @@ export function dropzoneCompleteCallback(file) {
         url: `${s3BucketHttps}${file.postData.key}`,
         originalFilename: file.name
       };
-      // console.log(json, JSON.stringify(json), JSON.stringify(json).replace('"', '\\"'));
-      inputHidden += `${window.btoa(JSON.stringify(json))}" />`;
-      // document.getElementById('uploader').appendChild(inputHidden);
+
+      let jsonStr = JSON.stringify(json);
+
+      // convert the json string to binary data so that btoa can encode it
+      jsonStr = toBinary(jsonStr);
+      inputHidden += `${window.btoa(jsonStr)}" />`;
       document.getElementById('uploader').innerHTML += inputHidden;
 
       const formParams = {