[refactor] improve data module

Author: zombieFox

src/js/data.js

@@ -2,70 +2,16 @@ var data = (function(){
 
 var_saveName="nitghTab";
 
-varset=function(key,data){
-localStorage.setItem(key,data);
-};
-
-varget=function(key){
-returnlocalStorage.getItem(key);
-};
-
-varremove=function(key){
-localStorage.removeItem(key);
-};
+varmod={};
 
-varsave=function(){
-vardata={
-nighttab: true,
-version: version.get(),
-state: state.get(),
-bookmarks: bookmarks.get()
-};
-set(_saveName,JSON.stringify(data));
-};
-
-varwipe=function(){
-remove(_saveName);
-};
-
-varload=function(){
-returnJSON.parse(get(_saveName));
-};
-
-varrestore=function(data){
-if(data){
-if(!("version"indata)||data.version!=version.get()){
-console.log("data version "+data.version+" found less than current");
-data=update.run(data);
-set(_saveName,JSON.stringify(data));
-}else{
-console.log("data version "+version.get()+" no need to run update");
-set(_saveName,JSON.stringify(data));
-};
-}else{
-console.log("no data found to load");
+mod.import=function(){
+varfileList=helper.e(".control-data-import").files;
+if(fileList.length>0){
+_validateJsonFile(fileList);
 };
 };
 
-varclearData=function(){
-varclearContent=helper.node("div");
-varpara1=helper.node("p:Are you sure you want to clear all nightTab Bookmarks and Settings?. nightTab will restore to the default state.");
-varpara2=helper.node("p:This can not be undone.");
-clearContent.appendChild(para1);
-clearContent.appendChild(para2);
-modal.render({
-heading: "Clear all nightTab data?",
-content: clearContent,
-successAction: function(){
-wipe();
-location.reload();
-},
-actionText: "Clear all data",
-size: "small"
-});
-};
-
-varexportData=function(){
+mod.export=function(){
 vartempAchor=helper.node("a");
 vartimeStamp=helper.getDateTime();
 var_timeStampPrefix=function(value){
@@ -81,16 +27,42 @@ 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;
-console.log(timeStamp);
 varfileName="nightTab backup - "+timeStamp+".json";
-varexportData="data:text/json;charset=utf-8,"+encodeURIComponent(JSON.stringify(load()));
-tempAchor.setAttribute("href",exportData);
+vardata="data:text/json;charset=utf-8,"+encodeURIComponent(JSON.stringify(load()));
+tempAchor.setAttribute("href",data);
 tempAchor.setAttribute("download",fileName);
 helper.e("html").appendChild(tempAchor);
 tempAchor.click();
 tempAchor.remove();
 };
 
+mod.restore=function(data){
+if(data){
+if(!("version"indata)||data.version!=version.get()){
+console.log("data version "+data.version+" found less than current");
+data=update.run(data);
+mod.set(_saveName,JSON.stringify(data));
+}else{
+console.log("data version "+version.get()+" no need to run update");
+mod.set(_saveName,JSON.stringify(data));
+};
+}else{
+console.log("no data found to load");
+};
+};
+
+mod.set=function(key,data){
+localStorage.setItem(key,data);
+};
+
+mod.get=function(key){
+returnlocalStorage.getItem(key);
+};
+
+mod.remove=function(key){
+localStorage.removeItem(key);
+};
+
 varbind={};
 
 bind.feedback={
@@ -117,6 +89,24 @@ var data = (function(){
 
 varrender={};
 
+render.clear=function(){
+varclearContent=helper.node("div");
+varpara1=helper.node("p:Are you sure you want to clear all nightTab Bookmarks and Settings?. nightTab will restore to the default state.");
+varpara2=helper.node("p:This can not be undone.");
+clearContent.appendChild(para1);
+clearContent.appendChild(para2);
+modal.render({
+heading: "Clear all nightTab data?",
+content: clearContent,
+successAction: function(){
+wipe();
+render.reload();
+},
+actionText: "Clear all data",
+size: "small"
+});
+};
+
 render.reload=function(){
 location.reload();
 };
@@ -170,16 +160,6 @@ var data = (function(){
 }
 };
 
-varimportData=function(){
-// get files from input
-varfileList=helper.e(".control-data-import").files;
-// if file was added
-if(fileList.length>0){
-// validate the file
-_validateJsonFile(fileList);
-};
-};
-
 var_validateJsonFile=function(fileList){
 // make new file reader
 varreader=newFileReader();
@@ -191,7 +171,7 @@ var data = (function(){
 if(JSON.parse(event.target.result).nighttab){
 render.feedback.clear();
 render.feedback.success(fileList[0].name,function(){
-restore(JSON.parse(event.target.result));
+mod.restore(JSON.parse(event.target.result));
 render.reload();
 });
 render.input.clear();
@@ -212,23 +192,36 @@ var data = (function(){
 reader.readAsText(fileList.item(0));
 };
 
+varsave=function(){
+mod.set(_saveName,JSON.stringify({
+nighttab: true,
+version: version.get(),
+state: state.get(),
+bookmarks: bookmarks.get()
+}));
+};
+
+varload=function(){
+returnJSON.parse(mod.get(_saveName));
+};
+
+varwipe=function(){
+mod.remove(_saveName);
+render.reload();
+};
+
 varinit=function(){
-restore(data.load());
+mod.restore(data.load());
 render.feedback.empty();
 };
 
 return{
 init: init,
+mod: mod,
+render: render,
 save: save,
-remove: remove,
-set: set,
-get: get,
 load: load,
-wipe: wipe,
-restore: restore,
-importData: importData,
-exportData: exportData,
-clearData: clearData
+wipe: wipe
 };
 
 })();

src/js/version.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="3.43.0";
+varcurrent="3.44.0";
 
 varcompare=function(a,b){
 varpa=a.split(".");

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": "3.43.0",
+"version": "3.44.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"