Skip to content

Commit 46ef9ef

Browse files
StigmatozStigmatoz
committed
settings part 2
1 parent f3874f5 commit 46ef9ef

File tree

7 files changed

+46
-37
lines changed

7 files changed

+46
-37
lines changed

‎options.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,14 @@
3232
</div>
3333
<div class="margin-top-10">
3434
<select id='intervalInactivity' class="option">
35-
<option value="0.3">30 seconds</option>
36-
<option value="0.45">45 seconds</option>
37-
<option value="1">1 min</option>
38-
<option value="2">2 min</option>
39-
<option value="5">5 mins</option>
40-
<option value="10">10 mins</option>
41-
<option value="15">15 mins</option>
42-
<option value="20">20 mins</option>
43-
<option value="30">30 mins</option>
35+
<option value="30">30 seconds</option>
36+
<option value="45">45 seconds</option>
37+
<option value="60">1 min</option>
38+
<option value="120">2 min</option>
39+
<option value="300">5 mins</option>
40+
<option value="600">10 mins</option>
41+
<option value="1200">20 mins</option>
42+
<option value="1800">30 mins</option>
4443
</select>
4544
</div>
4645
<div class="margin-top-10"><label>Default range for days:</label></div>

‎scripts/background.js‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,22 @@ var currentTab;
55
var activity = new Activity();
66
var storage = new LocalStorage();
77

8+
var setting_interval_save;
9+
var setting_interval_inactivity;
10+
var setting_view_in_badge;
11+
812
function updateSummaryTime() {
913
setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK_DEFAULT);
1014
}
1115

1216
function updateStorage() {
13-
setInterval(backgroundUpdateStorage, SETTINGS_INTERVAL_SAVE_STORAGE);
17+
storage.getSettings(SETTINGS_INTERVAL_SAVE_STORAGE, function (item) { setting_interval_save = item; });
18+
setInterval(backgroundUpdateStorage, setting_interval_save);
1419
}
1520

1621
function backgroundCheck() {
22+
storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
23+
storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
1724
chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
1825
if (currentWindow.focused) {
1926
var activeTab = currentWindow.tabs.find(t => t.active === true);
@@ -26,13 +33,15 @@ function backgroundCheck() {
2633

2734
if (tab !== undefined) {
2835
activity.setCurrentActiveTab(tab.url);
29-
chrome.idle.queryState(SETTINGS_INTERVAL_INACTIVITY, function (state) {
36+
chrome.idle.queryState(setting_interval_inactivity, function (state) {
3037
if (state === 'active') {
3138
tab.incSummaryTime();
32-
chrome.browserAction.setBadgeText({
33-
tabId: activeTab.id,
34-
text: String(convertSummaryTimeToBadgeString(tab.summaryTime))
35-
});
39+
if (setting_view_in_badge) {
40+
chrome.browserAction.setBadgeText({
41+
tabId: activeTab.id,
42+
text: String(convertSummaryTimeToBadgeString(tab.summaryTime))
43+
});
44+
}
3645
}
3746
});
3847
}
@@ -46,7 +55,7 @@ function backgroundUpdateStorage() {
4655
storage.saveTabs(tabs);
4756
}
4857

49-
function setDefaultSettings(){
58+
function setDefaultSettings() {
5059
storage.saveSettings(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
5160
storage.saveSettings(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
5261
storage.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
@@ -67,7 +76,7 @@ function addListener() {
6776
});
6877
chrome.runtime.onInstalled.addListener(function (details) {
6978
//if (details.reason == "install") {
70-
setDefaultSettings();
79+
setDefaultSettings();
7180
//}
7281
});
7382
}

‎scripts/common.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ var RangeForDays = {
1111
};
1212

1313
var InactivityInterval = {
14-
second30: 0.3,
15-
second45: 0.45,
16-
min1: 1,
17-
min2: 2,
18-
min5: 5,
19-
min10: 10,
20-
min20: 20,
21-
min30: 30,
22-
min40: 40
14+
second30: 30,
15+
second45: 45,
16+
min1: 60,
17+
min2: 120,
18+
min5: 300,
19+
min10: 600,
20+
min20: 1200,
21+
min30: 1800
2322
};
2423

2524
var TypeListEnum = {

‎scripts/settings.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ loadSettings();
2424

2525
function loadSettings(){
2626
storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item){
27-
document.getElementById('intervalInactivity').value = item[SETTINGS_INTERVAL_INACTIVITY];
27+
document.getElementById('intervalInactivity').value = item;
2828
});
2929
storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item){
30-
document.getElementById('rangeToDays').value = item[SETTINGS_INTERVAL_RANGE];
30+
document.getElementById('rangeToDays').value = item;
3131
});
3232
storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item){
33-
document.getElementById('viewTimeInBadge').setAttribute('checked', item[SETTINGS_VIEW_TIME_IN_BADGE]);
33+
document.getElementById('viewTimeInBadge').setAttribute('checked', item);
3434
});
3535
// storage.getSettings(SETTINGS_INTERVAL_SAVE_STORAGE, function (item){
3636
// document.getElementById('intervalInactivity').value = item;

‎scripts/storage.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class LocalStorage {
2020
}
2121

2222
getSettings(name, callback) {
23-
chrome.storage.local.get(name, function(item){
24-
if (item !== undefined){
25-
callback(item);
23+
chrome.storage.local.get(name, function (item) {
24+
if (item !== undefined) {
25+
callback(item[name]);
2626
}
2727
});
2828
}

‎scripts/ui.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ class UI {
2121
this.clearUI();
2222
}
2323

24-
setUIForByDays() {
24+
setUIForByDays(range) {
2525
document.getElementById('btnByDays').classList.add('active');
2626
document.getElementById('btnAll').classList.remove('active');
2727
document.getElementById('btnToday').classList.remove('active');
2828

2929
this.clearUI();
30-
this.addBlockForCalendar();
30+
this.addBlockForCalendar(range);
3131
}
3232

3333
clearUI() {
@@ -144,7 +144,7 @@ class UI {
144144
this.getTableOfSite().appendChild(div);
145145
}
146146

147-
addBlockForCalendar() {
147+
addBlockForCalendar(range) {
148148
var div = document.getElementById('byDays');
149149

150150
var from = document.createElement('span');
@@ -157,7 +157,7 @@ class UI {
157157
calendarFirst.id = 'dateFrom';
158158
calendarFirst.type = 'date';
159159
var previousDate = new Date(Date.UTC(dateNow.getFullYear(), dateNow.getMonth(), dateNow.getDate()));
160-
previousDate.setDate(previousDate.getDate() - 7);
160+
previousDate.setDate(previousDate.getDate() - range);
161161
calendarFirst.valueAsDate = previousDate;
162162

163163
var calendarTwo = document.createElement('input');

‎scripts/webact.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ var tabsFromStorage;
77
var targetTabs;
88
var currentTypeOfList;
99
var today = new Date().toLocaleDateString();
10+
var setting_range_days;
1011

1112
document.addEventListener('DOMContentLoaded', function () {
1213
document.getElementById('btnToday').addEventListener('click', function () {
@@ -21,7 +22,8 @@ document.addEventListener('DOMContentLoaded', function () {
2122
});
2223
document.getElementById('btnByDays').addEventListener('click', function () {
2324
currentTypeOfList = TypeListEnum.ByDays;
24-
ui.setUIForByDays();
25+
storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
26+
ui.setUIForByDays(setting_range_days);
2527
getDataFromStorageByDays();
2628
});
2729
document.getElementById('settings').addEventListener('click', function () {

0 commit comments

Comments
 (0)