mirror of
https://github.com/Oreolek/TrackMeNot-Chrome.git
synced 2024-05-11 05:28:18 +03:00
Final saving
This commit is contained in:
parent
49045a05e2
commit
955bdfb7e7
|
@ -58,6 +58,7 @@ function loadHandlers() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update controls based on saved options
|
||||||
function TMNSetOptionsMenu( options ) {
|
function TMNSetOptionsMenu( options ) {
|
||||||
let default_options = tmn._getOptions();
|
let default_options = tmn._getOptions();
|
||||||
options = $.extend({}, default_options, options);
|
options = $.extend({}, default_options, options);
|
||||||
|
@ -123,7 +124,6 @@ function TMNShowLog() {
|
||||||
$('#tmn_logs_container').html(htmlStr);
|
$('#tmn_logs_container').html(htmlStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function TMNShowEngines(engines) {
|
function TMNShowEngines(engines) {
|
||||||
let htmlStr = "<table>";
|
let htmlStr = "<table>";
|
||||||
for (let i=0; i<engines.length ; i++) {
|
for (let i=0; i<engines.length ; i++) {
|
||||||
|
@ -209,7 +209,14 @@ function TMNShowQueries() {
|
||||||
$('#tmn_logs_container').html(htmlStr);
|
$('#tmn_logs_container').html(htmlStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ES6 function to remove duplicates.
|
||||||
|
function remove_duplicates_es6(arr) {
|
||||||
|
let s = new Set(arr);
|
||||||
|
let it = s.values();
|
||||||
|
return Array.from(it);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make an options object and return it. Does not actually save anything.
|
||||||
function saveOptions() {
|
function saveOptions() {
|
||||||
let options = {};
|
let options = {};
|
||||||
options.enabled = $("#trackmenot-opt-enabled").is(':checked');
|
options.enabled = $("#trackmenot-opt-enabled").is(':checked');
|
||||||
|
@ -229,7 +236,15 @@ function saveOptions() {
|
||||||
let userlist = "";
|
let userlist = "";
|
||||||
reader.onload = function(e) {
|
reader.onload = function(e) {
|
||||||
userlist = reader.result;
|
userlist = reader.result;
|
||||||
options.userList = userlist.split("\n");
|
let words = userlist.split("\n");
|
||||||
|
words = remove_duplicates_es6(words);
|
||||||
|
words = words.filter(function(elem, pos) {
|
||||||
|
return (elem !== "");
|
||||||
|
});
|
||||||
|
browser.runtime.sendMessage({
|
||||||
|
'tmn':"TMNSaveUserlist",
|
||||||
|
'option':words,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
reader.readAsText(file);
|
reader.readAsText(file);
|
||||||
}
|
}
|
||||||
|
|
|
@ -214,6 +214,7 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
sendMessageToPanelScript("TMNSendOption",panel_inputs);
|
sendMessageToPanelScript("TMNSendOption",panel_inputs);
|
||||||
tmn_panel.port.on("TMNOpenOption",openOptionWindow);
|
tmn_panel.port.on("TMNOpenOption",openOptionWindow);
|
||||||
tmn_panel.port.on("TMNSaveOptions",saveOptionFromTab);
|
tmn_panel.port.on("TMNSaveOptions",saveOptionFromTab);
|
||||||
|
tmn_panel.port.on("TMNSaveUserlist",saveUserlist);
|
||||||
}
|
}
|
||||||
|
|
||||||
function openOptionWindow() {
|
function openOptionWindow() {
|
||||||
|
@ -261,6 +262,8 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
disableLogs = options.disableLogs;
|
disableLogs = options.disableLogs;
|
||||||
saveLogs = options.saveLogs;
|
saveLogs = options.saveLogs;
|
||||||
useBlackList = options.use_black_list;
|
useBlackList = options.use_black_list;
|
||||||
|
useRss = options.useRss;
|
||||||
|
useUserList = options.useUserList;
|
||||||
if ( useDHSList!= options.use_dhs_list) {
|
if ( useDHSList!= options.use_dhs_list) {
|
||||||
if ( options.use_dhs_list ) {
|
if ( options.use_dhs_list ) {
|
||||||
readDHSList();
|
readDHSList();
|
||||||
|
@ -1040,7 +1043,6 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
feedList = options.feedList;
|
feedList = options.feedList;
|
||||||
tmn_id = options.tmn_id;
|
tmn_id = options.tmn_id;
|
||||||
useRss = options.useRss;
|
useRss = options.useRss;
|
||||||
useUserList = options.useUserList;
|
|
||||||
if (browser.storage.local.get("gen_queries") != "") {
|
if (browser.storage.local.get("gen_queries") != "") {
|
||||||
TMNQueries = JSON.parse(browser.storage.local.get("gen_queries"));
|
TMNQueries = JSON.parse(browser.storage.local.get("gen_queries"));
|
||||||
}
|
}
|
||||||
|
@ -1098,6 +1100,10 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function saveUserlist (list) {
|
||||||
|
TMNQueries.userlist = list;
|
||||||
|
}
|
||||||
|
|
||||||
function log (entry) {
|
function log (entry) {
|
||||||
if (disableLogs)
|
if (disableLogs)
|
||||||
return;
|
return;
|
||||||
|
@ -1217,6 +1223,10 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
saveOptionFromTab(request.option);
|
saveOptionFromTab(request.option);
|
||||||
sendResponse({});
|
sendResponse({});
|
||||||
break;
|
break;
|
||||||
|
case "TMNSaveUserlist":
|
||||||
|
saveUserlist(request.option);
|
||||||
|
sendResponse({});
|
||||||
|
break;
|
||||||
case "TMNResetOptions":
|
case "TMNResetOptions":
|
||||||
resetOptions();
|
resetOptions();
|
||||||
sendResponse({});
|
sendResponse({});
|
||||||
|
@ -1273,20 +1283,7 @@ TRACKMENOT.TMNSearch = function() {
|
||||||
typeoffeeds.push('zeitgeist');
|
typeoffeeds.push('zeitgeist');
|
||||||
TMNQueries.zeitgeist = zeitgeist;
|
TMNQueries.zeitgeist = zeitgeist;
|
||||||
} else {
|
} else {
|
||||||
// populate userlist from the file — synchronous request
|
typeoffeeds.push('userlist');
|
||||||
var xhr = new XMLHttpRequest();
|
|
||||||
xhr.open("GET", browser.extension.getURL("tmn_wordlist.txt"), false);
|
|
||||||
xhr.onreadystatechange = function() {
|
|
||||||
if (xhr.readyState == 4) {
|
|
||||||
clearTimeout(tmn_errTimeout);
|
|
||||||
if (xhr.status >= 200 && xhr.status < 400 ) {
|
|
||||||
typeoffeeds.push('userlist');
|
|
||||||
let list = xhr.responseText;
|
|
||||||
TMNQueries.userlist = list.split("\n");
|
|
||||||
} else {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( useDHSList ) {
|
if ( useDHSList ) {
|
||||||
|
|
Loading…
Reference in a new issue