Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions common.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
var { storage, runtime, browserAction, pageAction, tabs, windows, menus, extension } = browser;
var { local } = storage;
var { sync } = storage;

var catchErr = e => console.error(e);


36 changes: 18 additions & 18 deletions ta_bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ ta_bg.initPageAction = info => {
ta_bg.listenMessageFromContentScript = () => {
var me = ta_bg;

runtime.onMessage.addListener( (request, sender, sendBack) => {
runtime.onMessage.addListener((request, sender, sendBack) => {

switch(request.behavior) {
switch (request.behavior) {
case 'init':
if (ta_database &&
ta_database.data &&
Expand All @@ -62,22 +62,22 @@ ta_bg.listenMessageFromContentScript = () => {
case 'set_exceptions':
ta_database.set(
'exceptions', request.val.split('\n').filter(site => site)
).then( () => sendBack({ msg: 'done'}) );
).then(() => sendBack({ msg: 'done' }));
break;
case 'set_options':
ta_database.setOptions(request).then( () => {
ta_database.setOptions(request).then(() => {
me.setupCacheList();
me.initPageAction({
forAll: true
});
sendBack({ msg: 'done'});
sendBack({ msg: 'done' });
});
break;
case 'get_options':
sendBack(ta_database.data.setting);
break;
case 'save':
var {title, val, type, id, url, sessionKey} = request;
var { title, val, type, id, url, sessionKey } = request;
ta_database.set(`${sessionKey} ${url} ${id}`, {
time: sessionKey,
type: type,
Expand All @@ -90,12 +90,12 @@ ta_bg.listenMessageFromContentScript = () => {
sendBack({ data: ta_database.data });
break;
case 'delete':
ta_database.remove(request.id).then( () => {
ta_database.remove(request.id).then(() => {
sendBack({ msg: 'done', deleted: request.id, data: ta_database.data });
});
break;
case 'clear':
ta_database.reset().then( () => {
ta_database.reset().then(() => {
sendBack({ msg: 'done' });
});
break;
Expand All @@ -111,7 +111,7 @@ ta_bg._popupListInWindow = () => {
type: "popup", // "normal", "popup"
height: 450,
width: 800
}).then(()=>{});
}).then(() => { });
};

ta_bg._popupListInTab = () => {
Expand Down Expand Up @@ -186,8 +186,8 @@ ta_bg.setupCacheList = () => {

ta_bg.setupContext = req => {
var me = ta_bg;
var site_names = Object.keys(ta_database.data).filter( t => t.includes(req.url));
var datas = site_names.map( name => ta_database.data[name] ).filter( d => d.url == req.url ).map( d => d.val );
var site_names = Object.keys(ta_database.data).filter(t => t.includes(req.url));
var datas = site_names.map(name => ta_database.data[name]).filter(d => d.url == req.url).map(d => d.val);
me.showCachesInContext(datas);
};

Expand Down Expand Up @@ -215,7 +215,7 @@ ta_bg.showCachesInContext = caches => {
type: 'separator'
});

caches.forEach( cache => {
caches.forEach(cache => {
menus.create({
id: cache,
title: cache,
Expand All @@ -239,15 +239,15 @@ ta_bg.setupAutoClear = () => {

if (!data.setting.shouldAutoClear) return;

var day = data.setting.autoClear_day,
var day = data.setting.autoClear_day,
hour = data.setting.autoClear_hour,
min = data.setting.autoClear_min;
min = data.setting.autoClear_min;

if (day + hour + min == 0) return;

var lifetime = day * 86400 +
hour * 3600 +
min * 60; // by second
var lifetime = day * 86400 +
hour * 3600 +
min * 60; // by second

var now = new Date();

Expand All @@ -265,4 +265,4 @@ ta_bg.setupAutoClear = () => {

browser.alarms.onAlarm.addListener(checkAutoClear);
checkAutoClear();
};
};
15 changes: 7 additions & 8 deletions ta_database.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ var ta_database = {
]
},

_loadFromStorage: () => local.get().then( db_data => {
_loadFromStorage: () => sync.get().then(db_data => {
ta_database.data = db_data;
}),

init: () => ta_database._loadFromStorage().then( async () => {
init: () => ta_database._loadFromStorage().then(async () => {
var me = ta_database;
var add_on_version = me.VERSION;
var current_version = me.data && me.data.version;
Expand Down Expand Up @@ -65,20 +65,20 @@ var ta_database = {
}
},

reset: () => local.clear().then( () => {
reset: () => sync.clear().then(() => {
// reserve setting, clean caches
var { data, _resetData } = ta_database;

var keep_config = Object.assign({}, _resetData);
if (data.setting) keep_config.setting = data.setting;
if (data.exceptions) keep_config.exceptions = data.exceptions;

return local.set(keep_config).then( () => {
return sync.set(keep_config).then(() => {
ta_database.data = keep_config;
});
}),

remove: key => local.remove(key).then( () => {
remove: key => sync.remove(key).then(() => {
delete ta_database.data[key];
}),

Expand All @@ -87,7 +87,7 @@ var ta_database = {

var tmp = {};
tmp[name] = obj;
return local.set(tmp);
return sync.set(tmp);
},

setOptions: config => {
Expand All @@ -98,5 +98,4 @@ var ta_database = {
},

print: () => console.log(ta_database.data)
};

};