groundwork for view data on popup

Stigmatoz · Stigmatoz · commit 882654ceab4b · 2018-12-25T09:18:06.000+03:00
diff --git a/index.html b/index.html
@@ -4,8 +4,9 @@
    <meta charset="utf-8">	
    <title>WebActivity Time Tracker</title>
    <link href="style/webact.css" rel="stylesheet"/>
-   <script src="scripts/webact.js"></script>
+   <script src="scripts/storage.js"></script>
    <script src="scripts/common.js"></script>
+   <script src="scripts/webact.js"></script>
 </head>
 <body>
    <div id="resultTable">
diff --git a/scripts/background.js b/scripts/background.js
@@ -4,13 +4,13 @@ var tabs = [];
 var activity = new Activity();
 var storage = new LocalStorage();
 
-chrome.tabs.onActivated.addListener(function (info) {
-    chrome.tabs.get(info.tabId, function (tab) {
-        activity.addTab(tab);
-    });
-});
+function updateSummaryTime() {
+    setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK);
+}
 
-setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK);
+function updateStorage() {
+    setInterval(backgroundUpdateStorage, SETTINGS_INTERVAL_SAVE_STORAGE);
+}
 
 function backgroundCheck() {
     chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
@@ -29,4 +29,21 @@ function backgroundCheck() {
             }
         }
     });
-}
+}
+
+function backgroundUpdateStorage() {
+    if (tabs.length > 0)
+        storage.save(STORAGE_TABS, tabs);
+}
+
+function addListener() {
+    chrome.tabs.onActivated.addListener(function (info) {
+        chrome.tabs.get(info.tabId, function (tab) {
+            activity.addTab(tab);
+        });
+    });
+}
+
+addListener();
+updateSummaryTime();
+updateStorage();
diff --git a/scripts/common.js b/scripts/common.js
@@ -1,6 +1,8 @@
 var STORAGE_TABS = 'tabs';
 var SETTINGS_INTERVAL_INACTIVITY = 30;
 var SETTINGS_INTERVAL_CHECK = 1000;
+var SETTINGS_INTERVAL_SAVE_STORAGE = 3000;
+var SETTINGS_INTERVAL_CHECK_STORAGE = 3000;
 
 function isEmpty(obj) {
     for (var prop in obj) {
diff --git a/scripts/storage.js b/scripts/storage.js
@@ -3,11 +3,12 @@
 class LocalStorage {
     load(name){
         chrome.storage.local.get(name, function (item){
-            return item[name];
+            if (item[name] !== undefined)
+                return JSON.parse(item[name]);
         });
     }
 
     save(name, value){
-        chrome.storage.local.set(name);
+        chrome.storage.local.set({name: JSON.stringify(value)});
     }
 };
diff --git a/scripts/webact.js b/scripts/webact.js
@@ -1,17 +1,14 @@
-window.onload = function () {
-    var resultTabs = {};
-    //var tabs = chrome.extension.getBackgroundPage().timer.tabs;
-    setInterval(getDataFromStorage, 3000);
-};
+var storage = new LocalStorage();
 
-function getDataFromStorage(){
-    chrome.storage.local.get('tabs', function(val){
-        resultTabs = JSON.parse(val.tabs);
-        getTabsFromStorage(resultTabs);
-    });
+setInterval(getDataFromStorage, SETTINGS_INTERVAL_CHECK_STORAGE);
+
+function getDataFromStorage() {
+    var currentTabs = storage.load(STORAGE_TABS);
+    if (currentTabs !== undefined && currentTabs.length > 0)
+        getTabsFromStorage(currentTabs);
 }
 
-function getTabsFromStorage(tabs){
+function getTabsFromStorage(tabs) {
     var table = document.getElementById('resultTable');
     table.innerHTML = null;
     for (var i = 0; i < tabs.length; i++) {

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,12 @@`
`3`	`3`	`class LocalStorage {`
`4`	`4`	`load(name){`
`5`	`5`	`chrome.storage.local.get(name, function (item){`
`6`		`- return item[name];`
	`6`	`+ if (item[name] !== undefined)`
	`7`	`+ return JSON.parse(item[name]);`
`7`	`8`	`});`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`save(name, value){`
`11`		`- chrome.storage.local.set(name);`
	`12`	`+ chrome.storage.local.set({name: JSON.stringify(value)});`
`12`	`13`	`}`
`13`	`14`	`};`