[bug] change export to support special characters in JSON file

zombieFox · zombieFox · commit dc59045cc3d3 · 2020-02-20T12:54:37.000Z
Switch back to encodeURIComponent when exporting data as JSON. This supports special characters better than "new Blob".
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
{
 "name": "nightTab",
- "version": "4.40.3",
+ "version": "4.40.4",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
 "main": "index.js",
 "scripts":{
diff --git a/src/js/data.js b/src/js/data.js
@@ -12,14 +12,6 @@ var data = (function(){
 };
 
 mod.export = function(){
- var encode = function(string){
- var out = [];
- for (var i = 0; i < string.length; i++){
- out[i] = string.charCodeAt(i);
- };
- return new Uint8Array(out);
- };
- var tempAchor = helper.node("a");
 var timeStamp = helper.getDateTime();
 var _timeStampPrefix = function(value){
 if (value < 10){
@@ -34,15 +26,10 @@ var data = (function(){
 timeStamp.month = _timeStampPrefix(timeStamp.month + 1);
 timeStamp.year = _timeStampPrefix(timeStamp.year);
 timeStamp = timeStamp.hours + " " + timeStamp.minutes + " " + timeStamp.seconds + " - " + timeStamp.date + "." + timeStamp.month + "." + timeStamp.year;
- var fileName = "nightTab backup - " + timeStamp + ".json";
- var str = JSON.stringify(load());
- var data = encode(str);
- var blob = new Blob([data],{
- type: "application/json"
- });
- var url = URL.createObjectURL(blob);
+ var fileName = _saveName + " backup - " + timeStamp + ".json";
+ var data = "data:text/json;charset=utf-8," + encodeURIComponent(JSON.stringify(load()));
 var link = document.createElement("a");
- link.setAttribute("href", url);
+ link.setAttribute("href", data);
 link.setAttribute("download", fileName);
 link.addEventListener("click", function(event){
 this.remove();
diff --git a/src/js/version.js b/src/js/version.js
@@ -1,6 +1,6 @@
 var version = (function(){
 
- var current = "4.40.3";
+ var current = "4.40.4";
 
 var name = "Naughty Goose";
 
diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
- "version": "4.40.3",
+ "version": "4.40.4",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nightTab",`
`3`		`-"version": "4.40.3",`
	`3`	`+"version": "4.40.4",`
`4`	`4`	`"description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts":{`
-Original file line number
+Diff line change
 };
 mod.export=function(){
 -varencode=function(string){
 -varout=[];
 -for(vari=0;i<string.length;i++){
 -out[i]=string.charCodeAt(i);
 -};
 -returnnewUint8Array(out);
 -};
 -vartempAchor=helper.node("a");
 vartimeStamp=helper.getDateTime();
 var_timeStampPrefix=function(value){
 if(value<10){
 timeStamp.month=_timeStampPrefix(timeStamp.month+1);
 timeStamp.year=_timeStampPrefix(timeStamp.year);
 timeStamp=timeStamp.hours+" "+timeStamp.minutes+" "+timeStamp.seconds+" - "+timeStamp.date+"."+timeStamp.month+"."+timeStamp.year;
 -varfileName="nightTab backup - "+timeStamp+".json";
 -varstr=JSON.stringify(load());
 -vardata=encode(str);
 -varblob=newBlob([data],{
 -type: "application/json"
 -});
 -varurl=URL.createObjectURL(blob);
 +varfileName=_saveName+" backup - "+timeStamp+".json";
 +vardata="data:text/json;charset=utf-8,"+encodeURIComponent(JSON.stringify(load()));
 varlink=document.createElement("a");
 -link.setAttribute("href",url);
 +link.setAttribute("href",data);
 link.setAttribute("download",fileName);
 link.addEventListener("click",function(event){
 this.remove();
-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 varversion=(function(){
 -varcurrent="4.40.3";
 +varcurrent="4.40.4";
 varname="Naughty Goose";