Skip to content

Commit 7526e79

Browse files
hai-altx-softhai-altx-soft
committed
Revert "MInify all css and js files"
This reverts commit 3fcb9be.
1 parent 3fcb9be commit 7526e79

File tree

12 files changed

+1700
-121
lines changed

12 files changed

+1700
-121
lines changed

‎scripts/activity.js‎

Lines changed: 78 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,78 @@
1-
'use strict';class Activity{addTab(tab){if(this.isValidPage(tab)===!0){if(tab.id&&(tab.id!=0)){tabs=tabs||[];var domain=this.extractHostname(tab.url);this.setCurrentActiveTab(domain);if(this.isNewUrl(domain)){var favicon=tab.favIconUrl;if(favicon===undefined){favicon='chrome://favicon/'+domain}
2-
var newTab=new Tab(domain,favicon);tabs.push(newTab)}}}
3-
else this.clearCurrentActiveTab()}
4-
isValidPage(tab){if(!tab||!tab.url||(tab.url.indexOf('http:')==-1&&tab.url.indexOf('https:')==-1)||tab.url.indexOf('chrome://')!==-1||tab.url.indexOf('chrome-extension://')!==-1)
5-
return!1;return!0}
6-
isNewUrl(domain){if(tabs.length>0)
7-
return tabs.find(o=>o.url===domain)===undefined;else return!0}
8-
getTab(domain){return tabs.find(o=>o.url===domain)}
9-
extractHostname(url){var hostname;if(url.indexOf("//")>-1){hostname=url.split('/')[2]}
10-
else{hostname=url.split('/')[0]}
11-
hostname=hostname.split(':')[0];hostname=hostname.split('?')[0];return hostname}
12-
loadDataFromStorage(){var tabs=storage.load(STORAGE_TABS)}
13-
updateFavicon(tab){var domain=this.extractHostname(tab.url);var currentTab=this.getTab(domain);if(currentTab!==null&&currentTab!==undefined){if(tab.favIconUrl!==undefined&&tab.favIconUrl!==currentTab.favicon){currentTab.favicon=tab.favIconUrl}}}
14-
setCurrentActiveTab(domain){currentTab=domain}
15-
clearCurrentActiveTab(){currentTab=''}}
1+
'use strict';
2+
3+
class Activity {
4+
addTab(tab) {
5+
if (this.isValidPage(tab) === true) {
6+
if (tab.id && (tab.id != 0)) {
7+
tabs = tabs || [];
8+
var domain = this.extractHostname(tab.url);
9+
this.setCurrentActiveTab(domain);
10+
if (this.isNewUrl(domain)) {
11+
var favicon = tab.favIconUrl;
12+
if (favicon === undefined){
13+
favicon = 'chrome://favicon/' + domain;
14+
}
15+
var newTab = new Tab(domain, favicon);
16+
tabs.push(newTab);
17+
}
18+
}
19+
}
20+
else this.clearCurrentActiveTab();
21+
}
22+
23+
isValidPage(tab) {
24+
if (!tab || !tab.url || (tab.url.indexOf('http:') == -1 && tab.url.indexOf('https:') == -1)
25+
|| tab.url.indexOf('chrome://') !== -1
26+
|| tab.url.indexOf('chrome-extension://') !== -1)
27+
return false;
28+
return true;
29+
}
30+
31+
isNewUrl(domain) {
32+
if (tabs.length > 0)
33+
return tabs.find(o => o.url === domain) === undefined;
34+
else return true;
35+
}
36+
37+
getTab(domain) {
38+
return tabs.find(o => o.url === domain);
39+
}
40+
41+
extractHostname(url) {
42+
var hostname;
43+
44+
if (url.indexOf("//") > -1) {
45+
hostname = url.split('/')[2];
46+
}
47+
else {
48+
hostname = url.split('/')[0];
49+
}
50+
51+
hostname = hostname.split(':')[0];
52+
hostname = hostname.split('?')[0];
53+
54+
return hostname;
55+
}
56+
57+
loadDataFromStorage(){
58+
var tabs = storage.load(STORAGE_TABS);
59+
}
60+
61+
updateFavicon(tab){
62+
var domain = this.extractHostname(tab.url);
63+
var currentTab = this.getTab(domain);
64+
if (currentTab !== null && currentTab !== undefined){
65+
if (tab.favIconUrl !== undefined && tab.favIconUrl !== currentTab.favicon){
66+
currentTab.favicon = tab.favIconUrl;
67+
}
68+
}
69+
}
70+
71+
setCurrentActiveTab(domain){
72+
currentTab = domain;
73+
}
74+
75+
clearCurrentActiveTab(){
76+
currentTab = '';
77+
}
78+
};

‎scripts/background.js‎

Lines changed: 103 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,103 @@
1-
'use strict';var tabs;var currentTab;var activity=new Activity();var storage=new LocalStorage();var setting_interval_save;var setting_interval_inactivity;var setting_view_in_badge;function updateSummaryTime(){setInterval(backgroundCheck,SETTINGS_INTERVAL_CHECK_DEFAULT)}
2-
function updateStorage(){setInterval(backgroundUpdateStorage,SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT)}
3-
function backgroundCheck(){storage.getSettings(SETTINGS_INTERVAL_INACTIVITY,function(item){setting_interval_inactivity=item});storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE,function(item){setting_view_in_badge=item});chrome.windows.getLastFocused({populate:!0},function(currentWindow){if(currentWindow.focused){var activeTab=currentWindow.tabs.find(t=>t.active===!0);if(activeTab!==undefined&&activity.isValidPage(activeTab)){var activeUrl=activity.extractHostname(activeTab.url);var tab=activity.getTab(activeUrl);if(tab===undefined){activity.addTab(activeTab)}
4-
if(tab!==undefined){activity.setCurrentActiveTab(tab.url);chrome.idle.queryState(parseInt(setting_interval_inactivity),function(state){if(state==='active'){tab.incSummaryTime();if(setting_view_in_badge===!0){var today=new Date().toLocaleDateString();var summary=tab.days.find(s=>s.date===today).summary;chrome.browserAction.setBadgeText({tabId:activeTab.id,text:String(convertSummaryTimeToBadgeString(summary))})}else{chrome.browserAction.setBadgeText({tabId:activeTab.id,text:''})}}})}}}})}
5-
function backgroundUpdateStorage(){if(tabs!=undefined&&tabs.length>0)
6-
storage.saveTabs(tabs)}
7-
function setDefaultSettings(){storage.saveSettings(SETTINGS_INTERVAL_INACTIVITY,SETTINGS_INTERVAL_INACTIVITY_DEFAULT);storage.saveSettings(SETTINGS_INTERVAL_RANGE,SETTINGS_INTERVAL_RANGE_DEFAULT);storage.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE,SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);storage.saveSettings(SETTINGS_INTERVAL_SAVE_STORAGE,SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT)}
8-
function addListener(){chrome.tabs.onActivated.addListener(function(info){chrome.tabs.get(info.tabId,function(tab){activity.addTab(tab)})});chrome.webNavigation.onCompleted.addListener(function(details){chrome.tabs.get(details.tabId,function(tab){activity.updateFavicon(tab)})});chrome.runtime.onInstalled.addListener(function(details){if(details.reason=="install"){setDefaultSettings()}})}
9-
function loadTabs(){storage.loadTabs(STORAGE_TABS,function(items)
10-
{tabs=[];for(var i=0;i<items.length;i++){tabs.push(new Tab(items[i].url,items[i].favicon,items[i].days,items[i].summaryTime))}})}
11-
loadTabs();addListener();updateSummaryTime();updateStorage()
1+
'use strict';
2+
3+
var tabs;
4+
var currentTab;
5+
var activity = new Activity();
6+
var storage = new LocalStorage();
7+
8+
var setting_interval_save;
9+
var setting_interval_inactivity;
10+
var setting_view_in_badge;
11+
12+
function updateSummaryTime() {
13+
setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK_DEFAULT);
14+
}
15+
16+
function updateStorage() {
17+
setInterval(backgroundUpdateStorage, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
18+
}
19+
20+
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; });
23+
chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
24+
if (currentWindow.focused) {
25+
var activeTab = currentWindow.tabs.find(t => t.active === true);
26+
if (activeTab !== undefined && activity.isValidPage(activeTab)) {
27+
var activeUrl = activity.extractHostname(activeTab.url);
28+
var tab = activity.getTab(activeUrl);
29+
if (tab === undefined) {
30+
activity.addTab(activeTab);
31+
}
32+
33+
if (tab !== undefined) {
34+
activity.setCurrentActiveTab(tab.url);
35+
chrome.idle.queryState(parseInt(setting_interval_inactivity), function (state) {
36+
if (state === 'active') {
37+
tab.incSummaryTime();
38+
if (setting_view_in_badge === true) {
39+
var today = new Date().toLocaleDateString();
40+
var summary = tab.days.find(s => s.date === today).summary;
41+
chrome.browserAction.setBadgeText({
42+
tabId: activeTab.id,
43+
text: String(convertSummaryTimeToBadgeString(summary))
44+
});
45+
} else {
46+
chrome.browserAction.setBadgeText({
47+
tabId: activeTab.id,
48+
text: ''
49+
});
50+
}
51+
}
52+
});
53+
}
54+
}
55+
}
56+
});
57+
}
58+
59+
function backgroundUpdateStorage() {
60+
if (tabs != undefined && tabs.length > 0)
61+
storage.saveTabs(tabs);
62+
}
63+
64+
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);
69+
}
70+
71+
function addListener() {
72+
chrome.tabs.onActivated.addListener(function (info) {
73+
chrome.tabs.get(info.tabId, function (tab) {
74+
activity.addTab(tab);
75+
});
76+
});
77+
78+
chrome.webNavigation.onCompleted.addListener(function (details) {
79+
chrome.tabs.get(details.tabId, function (tab) {
80+
activity.updateFavicon(tab);
81+
});
82+
});
83+
chrome.runtime.onInstalled.addListener(function (details) {
84+
if (details.reason == "install") {
85+
setDefaultSettings();
86+
}
87+
});
88+
}
89+
90+
function loadTabs() {
91+
storage.loadTabs(STORAGE_TABS, function (items)
92+
{
93+
tabs = [];
94+
for (var i=0; i<items.length; i++){
95+
tabs.push(new Tab(items[i].url, items[i].favicon, items[i].days, items[i].summaryTime));
96+
}
97+
});
98+
}
99+
100+
loadTabs();
101+
addListener();
102+
updateSummaryTime();
103+
updateStorage();

0 commit comments

Comments
 (0)