Skip to content

Commit 8154fb8

Browse files
committed
Additional display of total time and opening links in a new tab
1 parent 0eae49f commit 8154fb8

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/scripts/ui.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,16 @@ class UI {
135135
barChart(days);
136136
}
137137

138-
addTableHeader(currentTypeOfList, counterOfSite, totalDays) {
138+
addTableHeader(currentTypeOfList, counterOfSite, totalTime, totalDays) {
139139
var p = document.createElement('p');
140140
p.classList.add('table-header');
141141
if (currentTypeOfList === TypeListEnum.ToDay)
142-
p.innerHTML = 'Today (' + counterOfSite + ' sites)';
142+
p.innerHTML = 'Today (' + counterOfSite + ' sites) <br> <strong>' + convertShortSummaryTimeToLongString(totalTime) + '</strong>';
143143
if (currentTypeOfList === TypeListEnum.All && totalDays !== undefined) {
144144
if (totalDays.countOfDays > 0) {
145-
p.innerHTML = 'Aggregate data since ' + new Date(totalDays.minDate).toLocaleDateString() + ' (' + totalDays.countOfDays + ' days) (' + counterOfSite + ' sites)';
145+
p.innerHTML = 'Aggregate data since ' + new Date(totalDays.minDate).toLocaleDateString() + ' (' + totalDays.countOfDays + ' days) (' + counterOfSite + ' sites) <br> <strong>' + convertShortSummaryTimeToLongString(totalTime) + '</strong>';
146146
} else {
147-
p.innerHTML = 'Aggregate data since ' + new Date().toLocaleDateString() + ' (' + counterOfSite + ' sites)';
147+
p.innerHTML = 'Aggregate data since ' + new Date().toLocaleDateString() + ' (' + counterOfSite + ' sites) <br> <strong>' + convertShortSummaryTimeToLongString(totalTime) + '</strong>';
148148
}
149149
}
150150

@@ -185,6 +185,7 @@ class UI {
185185
divForImg.appendChild(img);
186186

187187
var spanUrl = this.createElement('span', ['span-url'], tab.url);
188+
spanUrl.setAttribute('href', 'https://' + tab.url);
188189

189190
if (tab.url == currentTab) {
190191
var divForImage = document.createElement('div');

src/scripts/webact.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ function firstInitPage() {
142142
});
143143
}
144144

145+
window.addEventListener('click', function (e) {
146+
if (e.target.nodeName == 'SPAN' && e.target.className == 'span-url' && e.target.attributes.href.value != undefined){
147+
chrome.tabs.create({ url: e.target.attributes.href.value })
148+
}
149+
});
150+
145151
function getLimitsListFromStorage() {
146152
storage.loadTabs(STORAGE_RESTRICTION_LIST, getLimitsListFromStorageCallback);
147153
}
@@ -212,9 +218,9 @@ function getTabsFromStorage(tabs) {
212218
}
213219

214220
if (currentTypeOfList === TypeListEnum.All)
215-
ui.addTableHeader(currentTypeOfList, counterOfSite, getFirstDay());
221+
ui.addTableHeader(currentTypeOfList, counterOfSite, totalTime, getFirstDay());
216222
if (currentTypeOfList === TypeListEnum.ToDay)
217-
ui.addTableHeader(currentTypeOfList, counterOfSite);
223+
ui.addTableHeader(currentTypeOfList, counterOfSite, totalTime);
218224

219225
var currentTab = getCurrentTab();
220226

0 commit comments

Comments
 (0)