Skip to content

Commit 11b92f6

Browse files
committed
view list of tabs with time on popup
1 parent 37040e4 commit 11b92f6

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

scripts/background.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function backgroundCheck() {
3737

3838
function backgroundUpdateStorage() {
3939
if (tabs.length > 0)
40-
storage.save(STORAGE_TABS, tabs);
40+
storage.save(tabs);
4141
}
4242

4343
function addListener() {

scripts/common.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ function isEmpty(obj) {
1414
}
1515

1616
function convertSummaryTimeToString(summaryTime) {
17-
var sec = (summaryTime / 1000).toFixed(1);
18-
var min = (summaryTime / (1000 * 60)).toFixed(1);
19-
var hours = (summaryTime / (1000 * 60 * 60)).toFixed(1);
20-
var days = (summaryTime / (1000 * 60 * 60 * 24)).toFixed(1);
17+
var sec = (summaryTime);
18+
var min = (summaryTime / 60);
19+
var hours = (summaryTime / (60 * 60));
20+
var days = (summaryTime / (60 * 60 * 24));
2121

2222
if (sec < 60) {
23-
return sec + " sec";
23+
return sec + " s";
2424
} else if (min < 60) {
25-
return min + " min";
25+
return min + " m";
2626
} else if (hours < 24) {
27-
return hours + " hours";
27+
return hours + " h";
2828
} else {
29-
return days + " days"
29+
return days + " d"
3030
}
3131
}

scripts/storage.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
'use strict';
22

33
class LocalStorage {
4-
load(name){
4+
load(name, callback){
55
chrome.storage.local.get(name, function (item){
6-
if (item[name] !== undefined)
7-
return JSON.parse(item[name]);
6+
if (item[name] !== undefined){
7+
var result = JSON.parse(item[name]);
8+
if (result !== undefined)
9+
callback(result);
10+
}
811
});
912
}
1013

11-
save(name, value){
12-
chrome.storage.local.set({name: JSON.stringify(value)});
14+
save(value){
15+
chrome.storage.local.set({tabs: JSON.stringify(value)});
1316
}
1417
};

scripts/webact.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
var storage = new LocalStorage();
22

3-
setInterval(getDataFromStorage, SETTINGS_INTERVAL_CHECK_STORAGE);
3+
setTimeout(function run() {
4+
getDataFromStorage();
5+
setTimeout(run, SETTINGS_INTERVAL_CHECK_STORAGE);
6+
}, 0);
47

58
function getDataFromStorage() {
6-
var currentTabs = storage.load(STORAGE_TABS);
7-
if (currentTabs !== undefined && currentTabs.length > 0)
8-
getTabsFromStorage(currentTabs);
9+
storage.load(STORAGE_TABS, getTabsFromStorage);
910
}
1011

1112
function getTabsFromStorage(tabs) {

0 commit comments

Comments
 (0)