Skip to content

Commit dd1a8dd

Browse files
committed
Fix error with local.storage
1 parent 9ab2b8f commit dd1a8dd

File tree

6 files changed

+17
-23
lines changed

6 files changed

+17
-23
lines changed

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"name": "Web Activity Time Tracker",
55
"short_name": "Web Activity",
6-
"version": "0.6.0",
6+
"version": "0.6.3",
77

88
"minimum_chrome_version": "26",
99

options.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</div>
6464
</div>
6565
<div id='aboutBlock' hidden>
66-
<div><label id='version'>v0.6.0</label></div>
66+
<div><label id='version'>v0.6.3</label></div>
6767
<div class="margin-top-20">
6868
<label>If experiencing problems, having questions or suggestions, please fill out <a href="https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/support" target="_blank">support
6969
form</a>.</label>

scripts/activity.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,6 @@ class Activity {
5454
return hostname;
5555
}
5656

57-
loadDataFromStorage(){
58-
var tabs = storage.load(STORAGE_TABS);
59-
}
60-
6157
updateFavicon(tab){
6258
var domain = this.extractHostname(tab.url);
6359
var currentTab = this.getTab(domain);

scripts/background.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
var tabs = [];
44
var currentTab;
55
var activity = new Activity();
6-
var storage = new LocalStorage();
76

87
var setting_interval_save;
98
var setting_interval_inactivity;
@@ -18,8 +17,8 @@ function updateStorage() {
1817
}
1918

2019
function backgroundCheck() {
21-
storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
22-
storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
20+
storageLocal.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
21+
storageLocal.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
2322
chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
2423
if (currentWindow.focused) {
2524
var activeTab = currentWindow.tabs.find(t => t.active === true);
@@ -58,14 +57,14 @@ function backgroundCheck() {
5857

5958
function backgroundUpdateStorage() {
6059
if (tabs.length > 0)
61-
storage.saveTabs(tabs);
60+
storageLocal.saveTabs(tabs);
6261
}
6362

6463
function setDefaultSettings() {
65-
storage.saveSettings(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
66-
storage.saveSettings(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
67-
storage.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
68-
storage.saveSettings(SETTINGS_INTERVAL_SAVE_STORAGE, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
64+
storageLocal.saveSettings(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
65+
storageLocal.saveSettings(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
66+
storageLocal.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
67+
storageLocal.saveSettings(SETTINGS_INTERVAL_SAVE_STORAGE, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
6968
}
7069

7170
function addListener() {

scripts/storage.js

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

3-
class LocalStorage {
3+
var storageLocal = {
44
loadTabs(name, callback) {
55
chrome.storage.sync.get(name, function (item) {
66
if (item[name] !== undefined) {
@@ -9,17 +9,17 @@ class LocalStorage {
99
callback(result);
1010
}
1111
});
12-
}
12+
},
1313

1414
saveTabs(value, callback) {
1515
chrome.storage.sync.set({ tabs: value });
1616
if (callback !== undefined)
1717
callback();
18-
}
18+
},
1919

2020
saveSettings(name, value) {
2121
chrome.storage.sync.set({ [name]: value });
22-
}
22+
},
2323

2424
getSettings(name, callback) {
2525
chrome.storage.sync.get(name, function (item) {
@@ -28,4 +28,4 @@ class LocalStorage {
2828
}
2929
});
3030
}
31-
};
31+
}

scripts/webact.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var storage = new LocalStorage();
43
var ui = new UI();
54
var totalTime;
65
var tabsFromStorage;
@@ -10,7 +9,7 @@ var today = new Date().toLocaleDateString();
109
var setting_range_days;
1110

1211
document.addEventListener('DOMContentLoaded', function () {
13-
storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
12+
storageLocal.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
1413
document.getElementById('btnToday').addEventListener('click', function () {
1514
currentTypeOfList = TypeListEnum.ToDay;
1615
ui.setUIForToday();
@@ -43,11 +42,11 @@ function firstInitPage() {
4342
}
4443

4544
function getDataFromStorage() {
46-
storage.loadTabs(STORAGE_TABS, getTabsFromStorage);
45+
storageLocal.loadTabs(STORAGE_TABS, getTabsFromStorage);
4746
}
4847

4948
function getDataFromStorageByDays() {
50-
storage.loadTabs(STORAGE_TABS, getTabsByDays);
49+
storageLocal.loadTabs(STORAGE_TABS, getTabsByDays);
5150
}
5251

5352
function getTabsFromStorage(tabs) {

0 commit comments

Comments
 (0)