mirror of
https://github.com/Oreolek/TrackMeNot-Chrome.git
synced 2024-06-26 03:41:00 +03:00
JS style lint, removed unused options
This commit is contained in:
parent
2e63034140
commit
b3a2bd271d
|
|
@ -48,51 +48,6 @@ TRACKMENOT.TMNInjected = function() {
|
|||
//cout("GENERATED ID="+id);
|
||||
return id;
|
||||
}
|
||||
var testAd_google = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
(
|
||||
anchorClass=='l' ||
|
||||
anchorClass=='l vst'
|
||||
) &&
|
||||
anchorlink.indexOf('http') === 0 &&
|
||||
anchorlink.indexOf('https') !== 0
|
||||
);
|
||||
};
|
||||
|
||||
var testAd_yahoo= function(anchorClass,anchorlink) {
|
||||
return ( anchorClass=='\"yschttl spt\"' || anchorClass=='yschttl spt');
|
||||
};
|
||||
|
||||
var testAd_aol = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorClass=='\"find\"' ||
|
||||
anchorClass=='find' &&
|
||||
anchorlink.indexOf('https') !== 0 &&
|
||||
anchorlink.indexOf('aol')<0
|
||||
);
|
||||
};
|
||||
|
||||
var testAd_bing = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
anchorlink.indexOf('http') === 0 &&
|
||||
anchorlink.indexOf('https') !== 0 &&
|
||||
anchorlink.indexOf('msn')<0 &&
|
||||
anchorlink.indexOf('live')<0 &&
|
||||
anchorlink.indexOf('bing')<0 &&
|
||||
anchorlink.indexOf('microsoft')<0 &&
|
||||
anchorlink.indexOf('WindowsLiveTranslator')<0
|
||||
);
|
||||
};
|
||||
|
||||
var testAd_baidu = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
anchorlink.indexOf('baidu') < 0 &&
|
||||
anchorlink.indexOf('https') !== 0
|
||||
);
|
||||
};
|
||||
|
||||
var getButton_google =" var getButton = function( ) {var button = getElementsByAttrValue(document,'button', 'name', 'btnG' ); if ( !button ) button = getElementsByAttrValue(document,'button', 'name', 'btnK' );return button;}";
|
||||
var getButton_yahoo= " var getButton = function( ) {return getElementsByAttrValue(document,'input', 'class', 'sbb' ); } ";
|
||||
|
|
@ -106,26 +61,6 @@ TRACKMENOT.TMNInjected = function() {
|
|||
SearchBox_aol= "var searchbox = function( ) {return document.getElementById('csbquery1'); }";
|
||||
SearchBox_baidu= "var searchbox = function( ) {return document.getElementById('kw');}";
|
||||
|
||||
var suggest_google = ['gsr' , 'td', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'gac_c' );
|
||||
}];
|
||||
|
||||
var suggest_yahoo = ['atgl' , 'a', function ( elt ) {
|
||||
return elt.hasAttribute('gossiptext');
|
||||
}];
|
||||
|
||||
var suggest_bing = ['sa_drw' , 'li', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'sa_sg' );
|
||||
}];
|
||||
|
||||
var suggest_baidu = ['st' , 'tr', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'ml' );
|
||||
}];
|
||||
|
||||
var suggest_aol = ['ACC' , 'a', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'acs');
|
||||
}];
|
||||
|
||||
var engines = [
|
||||
{'id':'google','name':'Google Search', 'urlmap':"https://www.google.com/search?hl=en&q=|", 'regexmap':"^(https?:\/\/[a-z]+\.google\.(co\\.|com\\.)?[a-z]{2,3}\/(search){1}[\?]?.*?[&\?]{1}q=)([^&]*)(.*)$", "host":"(www\.google\.(co\.|com\.)?[a-z]{2,3})$","testad":"var testad = function(ac,al) {return ( al&& (ac=='l' || ac=='l vst')&& al.indexOf('http')==0 && al.indexOf('https')!=0);}",'box':SearchBox_google,'button':getButton_google} ,
|
||||
{'id':'yahoo','name':'Yahoo! Search', 'urlmap':"http://search.yahoo.com/search;_ylt=" +getYahooId()+"?ei=UTF-8&fr=sfp&fr2=sfp&p=|&fspl=1", 'regexmap':"^(https?:\/\/[a-z.]*?search\.yahoo\.com\/search.*?p=)([^&]*)(.*)$", "host":"([a-z.]*?search\.yahoo\.com)$","testad":"var testad = function(ac,al) {return ( ac=='\"yschttl spt\"' || ac=='yschttl spt');}",'box':SearchBox_yahoo,'button':getButton_yahoo},
|
||||
|
|
|
|||
415
trackmenot.js
415
trackmenot.js
|
|
@ -27,16 +27,16 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let useTab = false;
|
||||
let enabled = true;
|
||||
let load_full_pages = false;
|
||||
let last_url = "";
|
||||
let stop_when = "start";
|
||||
let last_url = '';
|
||||
let stop_when = 'start';
|
||||
let useIncrementals = true;
|
||||
let incQueries = [];
|
||||
let searchEngines = "google";
|
||||
let searchEngines = 'google';
|
||||
let engine = 'google';
|
||||
let useRss = true;
|
||||
let useUserList = false;
|
||||
let TMNQueries = {};
|
||||
let branch = "extensions.trackmenot.";
|
||||
let branch = 'extensions.trackmenot.';
|
||||
let feedList = 'http://www.techmeme.com/index.xml|http://rss.slashdot.org/Slashdot/slashdot|http://feeds.nytimes.com/nyt/rss/HomePage';
|
||||
let tmnLogs = [];
|
||||
let disableLogs = false;
|
||||
|
|
@ -44,9 +44,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let kwBlackList = [];
|
||||
let useBlackList = true;
|
||||
let useDHSList = false;
|
||||
let zeitgeist = ["facebook","youtube","myspace","craigslist","ebay","yahoo","walmart","netflix","amazon","home depot","best buy","Kentucky Derby","NCIS","Offshore Drilling","Halle Berry","iPad Cases","Dorothy Provine","Emeril","Conan O'Brien","Blackberry","Free Comic Book Day"," American Idol","Palm","Montreal Canadiens","George Clooney","Crib Recall","Auto Financing","Katie Holmes","Madea's Big Happy Family","Old Navy Coupon","Sandra Bullock","Dancing With the Stars","M.I.A.","Matt Damon","Santa Clara County","Joey Lawrence","Southwest Airlines","Malcolm X","Milwaukee Bucks","Goldman Sachs","Hugh Hefner","Tito Ortiz","David McLaughlin","Box Jellyfish","Amtrak","Molly Ringwald","Einstein Horse","Oil Spill"," Bret Michaels","Mississippi Tornado","Stephen Hawking","Kelley Blue Book","Hertz","Mariah Carey","Taiwan Earthquake","Justin Bieber","Public Bike Rental","BlackBerry Pearl","NFL Draft","Jillian Michaels","Face Transplant","Dell","Jack in the Box","Rebbie Jackson","Xbox","Pampers","William Shatner","Earth Day","American Idol","Heather Locklear","McAfee Anti-Virus","PETA","Rihanna","South Park","Tiger Woods","Kate Gosselin","Unemployment","Dukan Diet","Oil Rig Explosion","Crystal Bowersox","New 100 Dollar Bill","Beastie Boys","Melanie Griffith","Borders","Tara Reid","7-Eleven","Dorothy Height","Volcanic Ash","Space Shuttle Discovery","Gang Starr","Star Trek","Michael Douglas","NASCAR","Isla Fisher","Beef Recall","Rolling Stone Magazine","ACM Awards","NASA Space Shuttle","Boston Marathon","Iraq","Jennifer Aniston"];
|
||||
let zeitgeist = ['facebook', 'youtube', 'myspace', 'craigslist', 'ebay', 'yahoo', 'walmart', 'netflix', 'amazon', 'home depot', 'best buy', 'Kentucky Derby', 'NCIS', 'Offshore Drilling', 'Halle Berry', 'iPad Cases', 'Dorothy Provine', 'Emeril', "Conan O'Brien", 'Blackberry', 'Free Comic Book Day', ' American Idol', 'Palm', 'Montreal Canadiens', 'George Clooney', 'Crib Recall', 'Auto Financing', 'Katie Holmes', "Madea's Big Happy Family", 'Old Navy Coupon', 'Sandra Bullock', 'Dancing With the Stars', 'M.I.A.', 'Matt Damon', 'Santa Clara County', 'Joey Lawrence', 'Southwest Airlines', 'Malcolm X', 'Milwaukee Bucks', 'Goldman Sachs', 'Hugh Hefner', 'Tito Ortiz', 'David McLaughlin', 'Box Jellyfish', 'Amtrak', 'Molly Ringwald', 'Einstein Horse', 'Oil Spill', ' Bret Michaels', 'Mississippi Tornado', 'Stephen Hawking', 'Kelley Blue Book', 'Hertz', 'Mariah Carey', 'Taiwan Earthquake', 'Justin Bieber', 'Public Bike Rental', 'BlackBerry Pearl', 'NFL Draft', 'Jillian Michaels', 'Face Transplant', 'Dell', 'Jack in the Box', 'Rebbie Jackson', 'Xbox', 'Pampers', 'William Shatner', 'Earth Day', 'American Idol', 'Heather Locklear', 'McAfee Anti-Virus', 'PETA', 'Rihanna', 'South Park', 'Tiger Woods', 'Kate Gosselin', 'Unemployment', 'Dukan Diet', 'Oil Rig Explosion', 'Crystal Bowersox', 'New 100 Dollar Bill', 'Beastie Boys', 'Melanie Griffith', 'Borders', 'Tara Reid', '7-Eleven', 'Dorothy Height', 'Volcanic Ash', 'Space Shuttle Discovery', 'Gang Starr', 'Star Trek', 'Michael Douglas', 'NASCAR', 'Isla Fisher', 'Beef Recall', 'Rolling Stone Magazine', 'ACM Awards', 'NASA Space Shuttle', 'Boston Marathon', 'Iraq', 'Jennifer Aniston'];
|
||||
let tmn_timeout = 6000;
|
||||
let prev_engine = "None";
|
||||
let prev_engine = 'None';
|
||||
let burstEngine = '';
|
||||
let burstTimeout = 6000;
|
||||
let burstEnabled = false;
|
||||
|
|
@ -80,52 +80,6 @@ TRACKMENOT.TMNSearch = function() {
|
|||
/cache/i, /similar/i, /login/i, /mail/i, /feed/i
|
||||
);
|
||||
|
||||
let testAd_google = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
(
|
||||
anchorClass=='l' ||
|
||||
anchorClass=='l vst'
|
||||
) &&
|
||||
anchorlink.indexOf('http') === 0 &&
|
||||
anchorlink.indexOf('https') !== 0
|
||||
);
|
||||
};
|
||||
|
||||
let testAd_yahoo= function(anchorClass,anchorlink) {
|
||||
return ( anchorClass=='\"yschttl spt\"' || anchorClass=='yschttl spt');
|
||||
};
|
||||
|
||||
let testAd_aol = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorClass=='\"find\"' ||
|
||||
anchorClass=='find' &&
|
||||
anchorlink.indexOf('https') !== 0 &&
|
||||
anchorlink.indexOf('aol') < 0
|
||||
);
|
||||
};
|
||||
|
||||
let testAd_bing = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
anchorlink.indexOf('http') === 0 &&
|
||||
anchorlink.indexOf('https') !== 0 &&
|
||||
anchorlink.indexOf('msn')<0 &&
|
||||
anchorlink.indexOf('live')<0 &&
|
||||
anchorlink.indexOf('bing')<0 &&
|
||||
anchorlink.indexOf('microsoft')<0 &&
|
||||
anchorlink.indexOf('WindowsLiveTranslator')<0
|
||||
);
|
||||
};
|
||||
|
||||
let testAd_baidu = function(anchorClass,anchorlink) {
|
||||
return (
|
||||
anchorlink &&
|
||||
anchorlink.indexOf('baidu') < 0 &&
|
||||
anchorlink.indexOf('https') !== 0
|
||||
);
|
||||
};
|
||||
|
||||
const getButton_google = " let getButton = function( ) {let button = getElementsByAttrValue(document,'button', 'name', 'btnG' ); if ( !button ) button = getElementsByAttrValue(document,'button', 'name', 'btnK' );return button;}";
|
||||
const getButton_yahoo = " let getButton = function( ) {return getElementsByAttrValue(document,'input', 'class', 'sbb' ); } ";
|
||||
const getButton_bing = " let getButton = function( ) {return document.getElementById('sb_form_go');} ";
|
||||
|
|
@ -138,82 +92,62 @@ TRACKMENOT.TMNSearch = function() {
|
|||
const SearchBox_aol = "let searchbox = function( ) {return document.getElementById('csbquery1'); }";
|
||||
const SearchBox_baidu = "let searchbox = function( ) {return document.getElementById('kw');}";
|
||||
|
||||
let suggest_google = ['gsr' , 'td', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'gac_c' );
|
||||
}];
|
||||
|
||||
let suggest_yahoo = ['atgl' , 'a', function ( elt ) {
|
||||
return elt.hasAttribute('gossiptext');
|
||||
}];
|
||||
|
||||
let suggest_bing = ['sa_drw' , 'li', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'sa_sg' );
|
||||
}];
|
||||
|
||||
let suggest_baidu = ['st' , 'tr', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'ml' );
|
||||
}];
|
||||
|
||||
let suggest_aol = ['ACC' , 'a', function ( elt ) {
|
||||
return (elt.hasAttribute('class') && elt.getAttribute('class') == 'acs');
|
||||
}];
|
||||
|
||||
let engines = [
|
||||
{
|
||||
'id': 'google',
|
||||
'name': 'Google Search',
|
||||
'urlmap':"https://www.google.com/search?hl=en&q=|",
|
||||
'regexmap':"^(https?:\/\/[a-z]+\.google\.(co\\.|com\\.)?[a-z]{2,3}\/(search){1}[\?]?.*?[&\?]{1}q=)([^&]*)(.*)$",
|
||||
"host":"(www\.google\.(co\.|com\.)?[a-z]{2,3})$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& (ac=='l' || ac=='l vst')&& al.indexOf('http')==0 && al.indexOf('https')!=0);}",
|
||||
'urlmap': 'https://www.google.com/search?hl=en&q=|',
|
||||
'regexmap': '^(https?:\/\/[a-z]+\.google\.(co\\.|com\\.)?[a-z]{2,3}\/(search){1}[\?]?.*?[&\?]{1}q=)([^&]*)(.*)$',
|
||||
'host': '(www\.google\.(co\.|com\.)?[a-z]{2,3})$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& (ac=='l' || ac=='l vst')&& al.indexOf('http')==0 && al.indexOf('https')!=0);}",
|
||||
'box': SearchBox_google,
|
||||
'button': getButton_google
|
||||
},
|
||||
{
|
||||
'id': 'yahoo',
|
||||
'name': 'Yahoo! Search',
|
||||
'urlmap':"http://search.yahoo.com/search;_ylt=" +getYahooId()+"?ei=UTF-8&fr=sfp&fr2=sfp&p=|&fspl=1",
|
||||
'regexmap':"^(http:\/\/[a-z.]*?search\.yahoo\.com\/search.*?p=)([^&]*)(.*)$",
|
||||
"host":"([a-z.]*?search\.yahoo\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( ac=='\"yschttl spt\"' || ac=='yschttl spt');}",
|
||||
'urlmap': 'http://search.yahoo.com/search;_ylt=' + getYahooId() + '?ei=UTF-8&fr=sfp&fr2=sfp&p=|&fspl=1',
|
||||
'regexmap': '^(http:\/\/[a-z.]*?search\.yahoo\.com\/search.*?p=)([^&]*)(.*)$',
|
||||
'host': '([a-z.]*?search\.yahoo\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( ac=='\"yschttl spt\"' || ac=='yschttl spt');}",
|
||||
'box': SearchBox_yahoo,
|
||||
'button': getButton_yahoo
|
||||
},
|
||||
{
|
||||
'id': 'bing',
|
||||
'name': 'Bing Search',
|
||||
'urlmap':"http://www.bing.com/search?q=|",
|
||||
'regexmap':"^(http:\/\/www\.bing\.com\/search\?[^&]*q=)([^&]*)(.*)$",
|
||||
"host":"(www\.bing\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& al.indexOf('http')==0&& al.indexOf('https')!=0 && al.indexOf('msn')<0 && al.indexOf('live')<0 && al.indexOf('bing')<0&& al.indexOf('microsoft')<0 && al.indexOf('WindowsLiveTranslator')<0 ) }",
|
||||
'urlmap': 'http://www.bing.com/search?q=|',
|
||||
'regexmap': '^(http:\/\/www\.bing\.com\/search\?[^&]*q=)([^&]*)(.*)$',
|
||||
'host': '(www\.bing\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& al.indexOf('http')==0&& al.indexOf('https')!=0 && al.indexOf('msn')<0 && al.indexOf('live')<0 && al.indexOf('bing')<0&& al.indexOf('microsoft')<0 && al.indexOf('WindowsLiveTranslator')<0 ) }",
|
||||
'box': SearchBox_bing,
|
||||
'button': getButton_bing
|
||||
},
|
||||
{
|
||||
'id': 'baidu',
|
||||
'name': 'Baidu Search',
|
||||
'urlmap':"http://www.baidu.com/s?wd=|",
|
||||
'regexmap':"^(http:\/\/www\.baidu\.com\/s\?.*?wd=)([^&]*)(.*)$",
|
||||
"host":"(www\.baidu\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& al.indexOf('baidu')<0 && al.indexOf('https')!=0);}",
|
||||
'urlmap': 'http://www.baidu.com/s?wd=|',
|
||||
'regexmap': '^(http:\/\/www\.baidu\.com\/s\?.*?wd=)([^&]*)(.*)$',
|
||||
'host': '(www\.baidu\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& al.indexOf('baidu')<0 && al.indexOf('https')!=0);}",
|
||||
'box': SearchBox_baidu,
|
||||
'button': getButton_baidu
|
||||
},
|
||||
{
|
||||
'id': 'aol',
|
||||
'name': 'Aol Search',
|
||||
'urlmap':"http://search.aol.com/aol/search?q=|",
|
||||
'regexmap':"^(http:\/\/[a-z0-9.]*?search\.aol\.com\/aol\/search\?.*?q=)([^&]*)(.*)$",
|
||||
"host":"([a-z0-9.]*?search\.aol\.com)$",
|
||||
"testad":"let testad = function(ac,al){return(ac=='\"find\"'||ac=='find'&& al.indexOf('https')!=0 && al.indexOf('aol')<0 );}",
|
||||
'urlmap': 'http://search.aol.com/aol/search?q=|',
|
||||
'regexmap': '^(http:\/\/[a-z0-9.]*?search\.aol\.com\/aol\/search\?.*?q=)([^&]*)(.*)$',
|
||||
'host': '([a-z0-9.]*?search\.aol\.com)$',
|
||||
'testad': "let testad = function(ac,al){return(ac=='\"find\"'||ac=='find'&& al.indexOf('https')!=0 && al.indexOf('aol')<0 );}",
|
||||
'box': SearchBox_aol,
|
||||
'button': getButton_aol
|
||||
},
|
||||
{
|
||||
'id': 'ddg',
|
||||
'name': 'DuckDuckGo Search',
|
||||
'urlmap':"http://duckduckgo.com/?q=|",
|
||||
'regexmap':"^(http:\/\/duckduckgo\.com\/?q=)([^&]*)(.*)$"
|
||||
'urlmap': 'http://duckduckgo.com/?q=|',
|
||||
'regexmap': '^(http:\/\/duckduckgo\.com\/?q=)([^&]*)(.*)$'
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -235,12 +169,12 @@ TRACKMENOT.TMNSearch = function() {
|
|||
|
||||
function updateEngineList() {
|
||||
browser.storage.local.set({engines: JSON.stringify(engines)});
|
||||
sendMessageToOptionScript("TMNSendEngines",engines);
|
||||
sendMessageToOptionScript('TMNSendEngines', engines);
|
||||
sendOptionToTab();
|
||||
}
|
||||
|
||||
function sendMessageToOptionScript(title, message) {
|
||||
browser.runtime.sendMessage({"options":title,"param":message});
|
||||
browser.runtime.sendMessage({'options': title, 'param': message});
|
||||
}
|
||||
|
||||
function handleMessageFromOptionScript(title, handler) {
|
||||
|
|
@ -256,21 +190,21 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function sendOptionParameters() {
|
||||
debug("Sending perameters");
|
||||
debug('Sending perameters');
|
||||
let panel_inputs = {
|
||||
"options": getOptions(),
|
||||
"query" : tmn_query,
|
||||
"engine": prev_engine
|
||||
'options': getOptions(),
|
||||
'query': tmn_query,
|
||||
'engine': prev_engine
|
||||
};
|
||||
sendMessageToPanelScript("TMNSendOption",panel_inputs);
|
||||
tmn_panel.port.on("TMNOpenOption",openOptionWindow);
|
||||
tmn_panel.port.on("TMNSaveOptions",saveOptionFromTab);
|
||||
tmn_panel.port.on("TMNSaveUserlist",saveUserlist);
|
||||
sendMessageToPanelScript('TMNSendOption', panel_inputs);
|
||||
tmn_panel.port.on('TMNOpenOption', openOptionWindow);
|
||||
tmn_panel.port.on('TMNSaveOptions', saveOptionFromTab);
|
||||
tmn_panel.port.on('TMNSaveUserlist', saveUserlist);
|
||||
}
|
||||
|
||||
function openOptionWindow() {
|
||||
tabs.open({
|
||||
url: data.url("options.html"),
|
||||
url: data.url('options.html'),
|
||||
onReady: runScript
|
||||
});
|
||||
}
|
||||
|
|
@ -278,8 +212,8 @@ TRACKMENOT.TMNSearch = function() {
|
|||
function runScript(tab) {
|
||||
worker_opt = tab.attach({
|
||||
contentScriptFile: [
|
||||
data.url("jquery.js"),
|
||||
data.url("option-script.js")
|
||||
data.url('jquery.js'),
|
||||
data.url('option-script.js')
|
||||
]
|
||||
});
|
||||
sendOptionToTab();
|
||||
|
|
@ -287,16 +221,16 @@ TRACKMENOT.TMNSearch = function() {
|
|||
|
||||
function sendOptionToTab() {
|
||||
let tab_inputs = {
|
||||
"options":getOptions()
|
||||
'options': getOptions()
|
||||
};
|
||||
sendMessageToOptionScript("TMNSendEngines",engines);
|
||||
sendMessageToOptionScript("TMNSetOptionsMenu",tab_inputs);
|
||||
sendMessageToOptionScript('TMNSendEngines', engines);
|
||||
sendMessageToOptionScript('TMNSetOptionsMenu', tab_inputs);
|
||||
}
|
||||
|
||||
function clearLog() {
|
||||
tmnLogs = [];
|
||||
browser.storage.local.set({
|
||||
"logs_tmn":"{}"
|
||||
'logs_tmn': '{}'
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -312,7 +246,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
useDHSList = options.use_dhs_list;
|
||||
|
||||
kwBlackList = options.kw_black_list.split(',');
|
||||
debug("Searched engines: "+ searchEngines);
|
||||
debug('Searched engines: ' + searchEngines);
|
||||
changeTabStatus(options.useTab);
|
||||
saveOptions();
|
||||
if (options.enabled)
|
||||
|
|
@ -321,7 +255,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
} else {
|
||||
stopTMN();
|
||||
}
|
||||
debug("useTab: " + options.useTab);
|
||||
debug('useTab: ' + options.useTab);
|
||||
}
|
||||
|
||||
function changeTabStatus(useT) {
|
||||
|
|
@ -340,12 +274,12 @@ TRACKMENOT.TMNSearch = function() {
|
|||
tmn_tab_id = tab.id;
|
||||
tmn_win_id = tab.windowId;
|
||||
browser.storage.local.set({
|
||||
"tmn_tab_id": tmn_tab_id
|
||||
'tmn_tab_id': tmn_tab_id
|
||||
});
|
||||
}
|
||||
|
||||
function getTMNTab() {
|
||||
debug("Trying to access to the tab: " + tmn_tab_id);
|
||||
debug('Trying to access to the tab: ' + tmn_tab_id);
|
||||
return tmn_tab_id;
|
||||
}
|
||||
|
||||
|
|
@ -381,9 +315,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
new_engine.urlmap = map;
|
||||
let query_params = map.split('|');
|
||||
let kw_param = query_params[0].split('?')[1].split('&').pop();
|
||||
new_engine.regexmap = '^('+ map.replace(/\//g,"\\/").replace(/\./g,"\\.").split('?')[0] + "\\?.*?[&\\?]{1}" +kw_param+")([^&]*)(.*)$";
|
||||
new_engine.regexmap = '^(' + map.replace(/\//g, '\\/').replace(/\./g, '\\.').split('?')[0] + '\\?.*?[&\\?]{1}' + kw_param + ')([^&]*)(.*)$';
|
||||
engines.push(new_engine);
|
||||
debug("Added engine : "+ new_engine.name + " url map is " + new_engine.urlmap );
|
||||
debug('Added engine: ' + new_engine.name + ' url map is ' + new_engine.urlmap);
|
||||
updateEngineList();
|
||||
}
|
||||
|
||||
|
|
@ -401,7 +335,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function getYahooId() {
|
||||
let id = "A0geu";
|
||||
let id = 'A0geu';
|
||||
while (id.length < 24) {
|
||||
let lower = Math.random() < 0.5;
|
||||
let num = parseInt(Math.random() * 38);
|
||||
|
|
@ -424,25 +358,25 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function trim(s) {
|
||||
if (!s || typeof s !== "string") {
|
||||
return "";
|
||||
if (!s || typeof s !== 'string') {
|
||||
return '';
|
||||
}
|
||||
return s.replace(/\n/g, '');
|
||||
}
|
||||
|
||||
function cerr(msg, e) {
|
||||
let txt = "[ERROR] "+msg;
|
||||
let txt = '[ERROR] ' + msg;
|
||||
if (e) {
|
||||
txt += "\n" + e;
|
||||
if (e.message)txt+=" | "+e.message;
|
||||
} else txt += " / No Exception";
|
||||
txt += '\n' + e;
|
||||
if (e.message)txt += ' | ' + e.message;
|
||||
} else txt += ' / No Exception';
|
||||
console.trace();
|
||||
console.log(txt);
|
||||
}
|
||||
|
||||
function debug(msg) {
|
||||
if (debug_)
|
||||
console.log("DEBUG: " +msg);
|
||||
console.log('DEBUG: ' + msg);
|
||||
}
|
||||
|
||||
function roll(min, max) {
|
||||
|
|
@ -456,7 +390,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let result = checkForSearchUrl(url);
|
||||
if (!result) {
|
||||
if (tab_id == tmn_tab_id) {
|
||||
debug("TMN tab tryign to visit: "+ url);
|
||||
debug('TMN tab tryign to visit: ' + url);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -468,7 +402,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let eng = result[4];
|
||||
let asearch = pre + '|' + post;
|
||||
if (tmn_tab_id == -1 || tab_id != tmn_tab_id) {
|
||||
debug("Worker find a match for url: "+ url + " on engine "+ eng +"!");
|
||||
debug('Worker find a match for url: ' + url + ' on engine ' + eng + '!');
|
||||
if (burstEnabled) {
|
||||
enterBurst(eng);
|
||||
}
|
||||
|
|
@ -478,7 +412,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
browser.storage.local.set({engines: JSON.stringify(engines)});
|
||||
let logEntry = createLog('URLmap', eng, null, null, null, asearch);
|
||||
log(logEntry);
|
||||
debug("Updated url fr search engine "+ eng + ", new url is "+asearch);
|
||||
debug('Updated url fr search engine ' + eng + ', new url is ' + asearch);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -493,7 +427,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
result = url.match(regex);
|
||||
|
||||
if (result) {
|
||||
console.log (regex + " MATCHED! on "+eng.id );
|
||||
console.log(regex + ' MATCHED! on ' + eng.id);
|
||||
id = eng.id;
|
||||
break;
|
||||
}
|
||||
|
|
@ -502,12 +436,12 @@ TRACKMENOT.TMNSearch = function() {
|
|||
return null;
|
||||
|
||||
if (result.length !== 4) {
|
||||
if (result.length === 6 && id == "google" ) {
|
||||
if (result.length === 6 && id == 'google') {
|
||||
result.splice(2, 2);
|
||||
result.push(id);
|
||||
return result;
|
||||
}
|
||||
console.log ("REGEX_ERROR: "+url);
|
||||
console.log('REGEX_ERROR: ' + url);
|
||||
}
|
||||
result.push(id);
|
||||
return result;
|
||||
|
|
@ -524,6 +458,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
/**
|
||||
* The function that constructs a random search query.
|
||||
* Used in doSearch, also see getSubQuery()
|
||||
* @return {string} search term
|
||||
*/
|
||||
function randomQuery() {
|
||||
let randomElt = function(arr) {
|
||||
|
|
@ -575,21 +510,21 @@ TRACKMENOT.TMNSearch = function() {
|
|||
function validateFeeds(param) {
|
||||
TMNQueries.rss = [];
|
||||
feedList = param.feeds;
|
||||
debug ("Validating the feeds: "+ feedList);
|
||||
debug('Validating the feeds: ' + feedList);
|
||||
const feeds = feedList.split('|');
|
||||
for (let i = 0; i < feeds.length; i++) {
|
||||
console.log (" Fetching " + feeds[i]);
|
||||
console.log(' Fetching ' + feeds[i]);
|
||||
doRssFetch(feeds[i]);
|
||||
}
|
||||
saveOptions();
|
||||
}
|
||||
|
||||
function extractQueries(html) {
|
||||
const forbiddenChar = new RegExp("^[ @#<>\"\\\/,;'{}:?%|\^~`=]", "g");
|
||||
const splitRegExp = new RegExp('^[\\[\\]\\(\\)\\"\']', "g");
|
||||
const forbiddenChar = new RegExp("^[ @#<>\"\\\/,;'{}:?%|\^~`=]", 'g');
|
||||
const splitRegExp = new RegExp('^[\\[\\]\\(\\)\\"\']', 'g');
|
||||
|
||||
if (!html) {
|
||||
console.log ("NO HTML!");
|
||||
console.log('NO HTML!');
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -598,11 +533,11 @@ TRACKMENOT.TMNSearch = function() {
|
|||
// Parse the HTML into phrases
|
||||
let l = html.split(/((<\?tr>)|(<br>)|(<\/?p>))/i);
|
||||
for (let i = 0; i < l.length; i++) {
|
||||
if( !l[i] || l[i] == "undefined") continue;
|
||||
l[i] = l[i].replace(/(<([^>]+)>)/ig," ");
|
||||
if (!l[i] || l[i] == 'undefined') continue;
|
||||
l[i] = l[i].replace(/(<([^>]+)>)/ig, ' ');
|
||||
//if (/([a-z]+ [a-z]+)/i.test(l[i])) {
|
||||
//let reg = /([a-z]{4,} [a-z]{4,} [a-z]{4,} ([a-z]{4,} ?) {0,3})/i;
|
||||
let matches = l[i].split(" ");//reg.exec(l[i]);
|
||||
let matches = l[i].split(' ');//reg.exec(l[i]);
|
||||
if (!matches || matches.length < 2)
|
||||
continue;
|
||||
let newQuery = trim(matches[1]);
|
||||
|
|
@ -611,7 +546,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
phrases.push(newQuery);
|
||||
}
|
||||
|
||||
const queryToAdd = phrases.join(" ");
|
||||
const queryToAdd = phrases.join(' ');
|
||||
TMNQueries.extracted = [].concat(TMNQueries.extracted);
|
||||
while (TMNQueries.extracted.length > 200) {
|
||||
let rand = roll(0, TMNQueries.extracted.length - 1);
|
||||
|
|
@ -655,37 +590,37 @@ TRACKMENOT.TMNSearch = function() {
|
|||
return false;
|
||||
}
|
||||
|
||||
let noniso = new RegExp("[^a-zA-Z0-9_.\ \\u00C0-\\u00FF+]+","g");
|
||||
let noniso = new RegExp('[^a-zA-Z0-9_.\ \\u00C0-\\u00FF+]+', 'g');
|
||||
|
||||
term = trim(term.replace(noniso, ''));
|
||||
|
||||
if (
|
||||
!term ||
|
||||
typeof term !== "string" ||
|
||||
typeof term !== 'string' ||
|
||||
isBlackList(term) ||
|
||||
(term.length < 3) ||
|
||||
(queryList.indexOf(term) > 0) ||
|
||||
term.indexOf("\"\"") > -1 ||
|
||||
term.indexOf("--") > -1 ||
|
||||
term.indexOf('\"\'') > -1 ||
|
||||
term.indexOf('--') > -1 ||
|
||||
// test for negation of a single term (eg '-prison')
|
||||
(
|
||||
term.indexOf("-") === 0 &&
|
||||
term.indexOf(" ") < 0
|
||||
term.indexOf(' - ') === 0 &&
|
||||
term.indexOf(' ') < 0
|
||||
) ||
|
||||
!queryOk(term)
|
||||
)
|
||||
return false;
|
||||
|
||||
queryList.push(term);
|
||||
//gtmn.console.log ("adding("+gtmn._queries.length+"): "+term);
|
||||
//gtmn.console.log ('adding(' +gtmn._queries.length+') : ' +term);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// returns # of keywords added
|
||||
function filterKeyWords(rssTitles, feedUrl) {
|
||||
const forbiddenChar = new RegExp("[ @#<>\"\\\/,;'{}:?%|\^~`=]+", "g");
|
||||
const splitRegExp = new RegExp('[\\[\\]\\(\\)\\"\']+', "g");
|
||||
const forbiddenChar = new RegExp('[@# < > \"\\\/,;\'{}:?%|\^~`=]+', 'g');
|
||||
const splitRegExp = new RegExp('[\\[\\]\\(\\)\\"\']+', 'g');
|
||||
const wordArray = rssTitles.split(forbiddenChar);
|
||||
|
||||
for (let i = 0; i < wordArray.length; i++) {
|
||||
|
|
@ -715,15 +650,15 @@ TRACKMENOT.TMNSearch = function() {
|
|||
|
||||
// returns # of keywords added
|
||||
function addRssTitles(xmlData, feedUrl) {
|
||||
let rssTitles = "";
|
||||
let rssTitles = '';
|
||||
|
||||
if (!useRss || !xmlData) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const feedTitles = xmlData.getElementsByTagName("title");
|
||||
const feedTitles = xmlData.getElementsByTagName('title');
|
||||
if (!feedTitles || feedTitles.length < 2) {
|
||||
cerr("no items("+feedTitles+") for rss-feed: "+feedUrl);
|
||||
cerr('no items(' + feedTitles + ') for rss-feed: ' + feedUrl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -734,7 +669,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
for (let i = 1; i < feedTitles.length; i++) {
|
||||
if (feedTitles[i].firstChild) {
|
||||
rssTitles = feedTitles[i].firstChild.nodeValue;
|
||||
rssTitles += " ----- ";
|
||||
rssTitles += ' ----- ';
|
||||
}
|
||||
let queryToAdd = filterKeyWords(rssTitles, feedUrl);
|
||||
addQuery(queryToAdd, feedObject.words);
|
||||
|
|
@ -752,8 +687,8 @@ TRACKMENOT.TMNSearch = function() {
|
|||
TMNQueries.dhs = [];
|
||||
let i = 0;
|
||||
let req = new XMLHttpRequest();
|
||||
req.overrideMimeType("application/json");
|
||||
req.open('GET',browser.extension.getURL("dhs_keywords.json"),true);
|
||||
req.overrideMimeType('application/json');
|
||||
req.open('GET', browser.extension.getURL('dhs_keywords.json'), true);
|
||||
req.onreadystatechange = function() {
|
||||
let response = JSON.parse(req.responseText);
|
||||
let keywords = response.keywords;
|
||||
|
|
@ -786,19 +721,19 @@ TRACKMENOT.TMNSearch = function() {
|
|||
req.send(null);
|
||||
} catch (ex) {
|
||||
console.log(
|
||||
"[WARN] doRssFetch("+
|
||||
'[WARN] doRssFetch(' +
|
||||
feedUrl +
|
||||
")\n"+
|
||||
" "+
|
||||
')\n' +
|
||||
' ' +
|
||||
ex.message +
|
||||
" | Using defaults..."
|
||||
' | Using defaults...'
|
||||
);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
function getSubQuery(queryWords) {
|
||||
let incQuery = "";
|
||||
let incQuery = '';
|
||||
let randomArray = [];
|
||||
for (let k = 0; k < queryWords.length && k < 5; k++) {
|
||||
let randomIndex = roll(0, queryWords.length - 1);
|
||||
|
|
@ -861,7 +796,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function createLog(type, engine, mode, query, id, asearch) {
|
||||
let logEntry = { 'type' : type, "engine" : engine };
|
||||
let logEntry = { 'type': type, 'engine': engine };
|
||||
if (mode)
|
||||
logEntry.mode = tmn_mode;
|
||||
if (query)
|
||||
|
|
@ -895,7 +830,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
sendQuery(newquery);
|
||||
}
|
||||
} catch (e) {
|
||||
cerr("error in doSearch",e);
|
||||
cerr('error in doSearch', e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -935,9 +870,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
} else {
|
||||
let queryURL = queryToURL(url, queryToSend);
|
||||
debug ("The encoded URL is " + queryURL);
|
||||
debug('The encoded URL is ' + queryURL);
|
||||
let xhr = new XMLHttpRequest();
|
||||
xhr.open("GET", queryURL, true);
|
||||
xhr.open('GET', queryURL, true);
|
||||
xhr.onreadystatechange = function() {
|
||||
if (xhr.readyState == 4) {
|
||||
clearTimeout(tmn_errTimeout);
|
||||
|
|
@ -970,24 +905,24 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let urlQuery = url.replace('|', query);
|
||||
urlQuery = urlQuery.replace(/ /g, ' +');
|
||||
let encodedUrl = encodeURI(urlQuery);
|
||||
encodedUrl = encodedUrl.replace(/%253/g,"%3");
|
||||
encodedUrl = encodedUrl.replace(/%253/g, '%3');
|
||||
|
||||
return encodedUrl;
|
||||
}
|
||||
|
||||
function updateCurrentURL(taburl) {
|
||||
currentTMNURL = taburl.url;
|
||||
debug("currentTMNURL is :"+currentTMNURL);
|
||||
debug('currentTMNURL is :' + currentTMNURL);
|
||||
}
|
||||
|
||||
function rescheduleOnError() {
|
||||
let pauseAfterError = Math.max(2 * tmn_timeout, 60000);
|
||||
tmn_mode = 'recovery';
|
||||
burstCount = 0;
|
||||
console.log ("[INFO] Trying again in "+(pauseAfterError/1000)+ "s");
|
||||
console.log('[INFO] Trying again in ' + (pauseAfterError / 1000) + 's');
|
||||
log({
|
||||
'type': 'ERROR' ,
|
||||
'message': 'next search in '+(pauseAfterError/1000)+ "s",
|
||||
'message': 'next search in ' + (pauseAfterError / 1000) + 's',
|
||||
'engine': engine
|
||||
});
|
||||
updateOnErr();
|
||||
|
|
@ -1035,7 +970,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
function enterBurst(burst_engine) {
|
||||
if (!burstEnabled)
|
||||
return;
|
||||
console.log ("Entering burst mode for engine: " + burst_engine);
|
||||
console.log('Entering burst mode for engine: ' + burst_engine);
|
||||
let logMessage = {
|
||||
type: 'info',
|
||||
message: 'User made a search, start burst',
|
||||
|
|
@ -1057,9 +992,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
function saveOptions() {
|
||||
let options = getOptions();
|
||||
browser.storage.local.set({
|
||||
"options_tmn": JSON.stringify(options),
|
||||
"tmn_id": tmn_id,
|
||||
"gen_queries": JSON.stringify(TMNQueries)
|
||||
'options_tmn': JSON.stringify(options),
|
||||
'tmn_id': tmn_id,
|
||||
'gen_queries': JSON.stringify(TMNQueries)
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1073,7 +1008,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
options.feedList = feedList;
|
||||
options.use_black_list = useBlackList;
|
||||
options.use_dhs_list = useDHSList;
|
||||
options.kw_black_list = kwBlackList.join(",");
|
||||
options.kw_black_list = kwBlackList.join(',');
|
||||
options.saveLogs = saveLogs;
|
||||
options.disableLogs = disableLogs;
|
||||
options.useRss = useRss;
|
||||
|
|
@ -1085,7 +1020,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
enabled = true;
|
||||
timeout = 6000;
|
||||
burstMode = true;
|
||||
searchEngines = "google,yahoo,bing";
|
||||
searchEngines = 'google,yahoo,bing';
|
||||
useTab = false;
|
||||
useBlackList = true;
|
||||
useDHSList = false;
|
||||
|
|
@ -1096,7 +1031,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function restoreOptions() {
|
||||
let getter = browser.storage.local.get("options_tmn");
|
||||
let getter = browser.storage.local.get('options_tmn');
|
||||
getter.then(function(item) {
|
||||
let options;
|
||||
try {
|
||||
|
|
@ -1106,7 +1041,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
return;
|
||||
}
|
||||
enabled = options.enabled;
|
||||
debug("Restore: "+ enabled);
|
||||
debug('Restore: ' + enabled);
|
||||
useBlackList = options.use_black_list;
|
||||
useDHSList = options.use_dhs_list;
|
||||
tmn_timeout = options.timeout;
|
||||
|
|
@ -1122,15 +1057,15 @@ TRACKMENOT.TMNSearch = function() {
|
|||
options.kw_black_list &&
|
||||
options.kw_black_list.length > 0
|
||||
) {
|
||||
kwBlackList = options.kw_black_list.split(",");
|
||||
kwBlackList = options.kw_black_list.split(',');
|
||||
}
|
||||
}, function() {
|
||||
// error in getting
|
||||
initOptions();
|
||||
console.log ("Init: "+ enabled);
|
||||
console.log('Init: ' + enabled);
|
||||
return;
|
||||
});
|
||||
let querygetter = browser.storage.local.get("gen_queries");
|
||||
let querygetter = browser.storage.local.get('gen_queries');
|
||||
querygetter.then(function(item) {
|
||||
try {
|
||||
TMNQueries = JSON.parse(item.gen_queries);
|
||||
|
|
@ -1138,18 +1073,18 @@ TRACKMENOT.TMNSearch = function() {
|
|||
TMNQueries = {};
|
||||
}
|
||||
});
|
||||
let loggetter = browser.storage.local.get("logs_tmn");
|
||||
let loggetter = browser.storage.local.get('logs_tmn');
|
||||
loggetter.then(function(item) {
|
||||
try {
|
||||
tmnLogs = JSON.parse(item.logs_tmn);
|
||||
if (typeof tmnLogs === "object") {
|
||||
if (typeof tmnLogs === 'object') {
|
||||
tmnLogs = Object.keys(tmnLogs).map(x => tmnLogs[x]);
|
||||
}
|
||||
} catch (e) {
|
||||
tmnLogs = [];
|
||||
}
|
||||
});
|
||||
let enginegetter = browser.storage.local.get("engines");
|
||||
let enginegetter = browser.storage.local.get('engines');
|
||||
enginegetter.then(function(item) {
|
||||
try {
|
||||
engines = JSON.parse(item.engines);
|
||||
|
|
@ -1165,26 +1100,26 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
|
||||
function resetOptions() {
|
||||
console.log("Resetting options");
|
||||
console.log('Resetting options');
|
||||
browser.storage.local.remove([
|
||||
"options_tmn",
|
||||
"tmn_id",
|
||||
"gen_queries",
|
||||
'options_tmn',
|
||||
'tmn_id',
|
||||
'gen_queries',
|
||||
]);
|
||||
|
||||
useTab = false;
|
||||
enabled = true;
|
||||
load_full_pages = false;
|
||||
last_url = "";
|
||||
stop_when = "start";
|
||||
last_url = '';
|
||||
stop_when = 'start';
|
||||
useIncrementals = true;
|
||||
incQueries = [];
|
||||
searchEngines = "google";
|
||||
searchEngines = 'google';
|
||||
engine = 'google';
|
||||
useRss = true;
|
||||
useUserList = false;
|
||||
TMNQueries = {};
|
||||
branch = "extensions.trackmenot.";
|
||||
branch = 'extensions.trackmenot.';
|
||||
feedList = 'http://www.techmeme.com/index.xml|http://rss.slashdot.org/Slashdot/slashdot|http://feeds.nytimes.com/nyt/rss/HomePage';
|
||||
tmnLogs = [];
|
||||
disableLogs = false;
|
||||
|
|
@ -1192,9 +1127,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
kwBlackList = [];
|
||||
useBlackList = true;
|
||||
useDHSList = false;
|
||||
zeitgeist = ["facebook","youtube","myspace","craigslist","ebay","yahoo","walmart","netflix","amazon","home depot","best buy","Kentucky Derby","NCIS","Offshore Drilling","Halle Berry","iPad Cases","Dorothy Provine","Emeril","Conan O'Brien","Blackberry","Free Comic Book Day"," American Idol","Palm","Montreal Canadiens","George Clooney","Crib Recall","Auto Financing","Katie Holmes","Madea's Big Happy Family","Old Navy Coupon","Sandra Bullock","Dancing With the Stars","M.I.A.","Matt Damon","Santa Clara County","Joey Lawrence","Southwest Airlines","Malcolm X","Milwaukee Bucks","Goldman Sachs","Hugh Hefner","Tito Ortiz","David McLaughlin","Box Jellyfish","Amtrak","Molly Ringwald","Einstein Horse","Oil Spill"," Bret Michaels","Mississippi Tornado","Stephen Hawking","Kelley Blue Book","Hertz","Mariah Carey","Taiwan Earthquake","Justin Bieber","Public Bike Rental","BlackBerry Pearl","NFL Draft","Jillian Michaels","Face Transplant","Dell","Jack in the Box","Rebbie Jackson","Xbox","Pampers","William Shatner","Earth Day","American Idol","Heather Locklear","McAfee Anti-Virus","PETA","Rihanna","South Park","Tiger Woods","Kate Gosselin","Unemployment","Dukan Diet","Oil Rig Explosion","Crystal Bowersox","New 100 Dollar Bill","Beastie Boys","Melanie Griffith","Borders","Tara Reid","7-Eleven","Dorothy Height","Volcanic Ash","Space Shuttle Discovery","Gang Starr","Star Trek","Michael Douglas","NASCAR","Isla Fisher","Beef Recall","Rolling Stone Magazine","ACM Awards","NASA Space Shuttle","Boston Marathon","Iraq","Jennifer Aniston"];
|
||||
zeitgeist = ['facebook', 'youtube', 'myspace', 'craigslist', 'ebay', 'yahoo', 'walmart', 'netflix', 'amazon', 'home depot', 'best buy', 'Kentucky Derby', 'NCIS', 'Offshore Drilling', 'Halle Berry', 'iPad Cases', 'Dorothy Provine', 'Emeril', "Conan O'Brien", 'Blackberry', 'Free Comic Book Day', ' American Idol', 'Palm', 'Montreal Canadiens', 'George Clooney', 'Crib Recall', 'Auto Financing', 'Katie Holmes', "Madea's Big Happy Family", 'Old Navy Coupon', 'Sandra Bullock', 'Dancing With the Stars', 'M.I.A.', 'Matt Damon', 'Santa Clara County', 'Joey Lawrence', 'Southwest Airlines', 'Malcolm X', 'Milwaukee Bucks', 'Goldman Sachs', 'Hugh Hefner', 'Tito Ortiz', 'David McLaughlin', 'Box Jellyfish', 'Amtrak', 'Molly Ringwald', 'Einstein Horse', 'Oil Spill', ' Bret Michaels', 'Mississippi Tornado', 'Stephen Hawking', 'Kelley Blue Book', 'Hertz', 'Mariah Carey', 'Taiwan Earthquake', 'Justin Bieber', 'Public Bike Rental', 'BlackBerry Pearl', 'NFL Draft', 'Jillian Michaels', 'Face Transplant', 'Dell', 'Jack in the Box', 'Rebbie Jackson', 'Xbox', 'Pampers', 'William Shatner', 'Earth Day', 'American Idol', 'Heather Locklear', 'McAfee Anti-Virus', 'PETA', 'Rihanna', 'South Park', 'Tiger Woods', 'Kate Gosselin', 'Unemployment', 'Dukan Diet', 'Oil Rig Explosion', 'Crystal Bowersox', 'New 100 Dollar Bill', 'Beastie Boys', 'Melanie Griffith', 'Borders', 'Tara Reid', '7-Eleven', 'Dorothy Height', 'Volcanic Ash', 'Space Shuttle Discovery', 'Gang Starr', 'Star Trek', 'Michael Douglas', 'NASCAR', 'Isla Fisher', 'Beef Recall', 'Rolling Stone Magazine', 'ACM Awards', 'NASA Space Shuttle', 'Boston Marathon', 'Iraq', 'Jennifer Aniston'];
|
||||
tmn_timeout = 6000;
|
||||
prev_engine = "None";
|
||||
prev_engine = 'None';
|
||||
burstEngine = '';
|
||||
burstTimeout = 6000;
|
||||
burstEnabled = false;
|
||||
|
|
@ -1213,58 +1148,58 @@ TRACKMENOT.TMNSearch = function() {
|
|||
{
|
||||
'id': 'google',
|
||||
'name': 'Google Search',
|
||||
'urlmap':"https://www.google.com/search?hl=en&q=|",
|
||||
'regexmap':"^(https?:\/\/[a-z]+\.google\.(co\\.|com\\.)?[a-z]{2,3}\/(search){1}[\?]?.*?[&\?]{1}q=)([^&]*)(.*)$",
|
||||
"host":"(www\.google\.(co\.|com\.)?[a-z]{2,3})$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& (ac=='l' || ac=='l vst')&& al.indexOf('http')==0 && al.indexOf('https')!=0);}",
|
||||
'urlmap': 'https://www.google.com/search?hl=en&q=|',
|
||||
'regexmap': '^(https?:\/\/[a-z]+\.google\.(co\\.|com\\.)?[a-z]{2,3}\/(search){1}[\?]?.*?[&\?]{1}q=)([^&]*)(.*)$',
|
||||
'host': '(www\.google\.(co\.|com\.)?[a-z]{2,3})$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& (ac=='l' || ac=='l vst')&& al.indexOf('http')==0 && al.indexOf('https')!=0);}",
|
||||
'box': SearchBox_google,
|
||||
'button': getButton_google
|
||||
},
|
||||
{
|
||||
'id': 'yahoo',
|
||||
'name': 'Yahoo! Search',
|
||||
'urlmap':"http://search.yahoo.com/search;_ylt=" +getYahooId()+"?ei=UTF-8&fr=sfp&fr2=sfp&p=|&fspl=1",
|
||||
'regexmap':"^(http:\/\/[a-z.]*?search\.yahoo\.com\/search.*?p=)([^&]*)(.*)$",
|
||||
"host":"([a-z.]*?search\.yahoo\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( ac=='\"yschttl spt\"' || ac=='yschttl spt');}",
|
||||
'urlmap': 'http://search.yahoo.com/search;_ylt=' + getYahooId() + '?ei=UTF-8&fr=sfp&fr2=sfp&p=|&fspl=1',
|
||||
'regexmap': '^(http:\/\/[a-z.]*?search\.yahoo\.com\/search.*?p=)([^&]*)(.*)$',
|
||||
'host': '([a-z.]*?search\.yahoo\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( ac=='\"yschttl spt\"' || ac=='yschttl spt');}",
|
||||
'box': SearchBox_yahoo,
|
||||
'button': getButton_yahoo
|
||||
},
|
||||
{
|
||||
'id': 'bing',
|
||||
'name': 'Bing Search',
|
||||
'urlmap':"http://www.bing.com/search?q=|",
|
||||
'regexmap':"^(http:\/\/www\.bing\.com\/search\?[^&]*q=)([^&]*)(.*)$",
|
||||
"host":"(www\.bing\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& al.indexOf('http')==0&& al.indexOf('https')!=0 && al.indexOf('msn')<0 && al.indexOf('live')<0 && al.indexOf('bing')<0&& al.indexOf('microsoft')<0 && al.indexOf('WindowsLiveTranslator')<0 ) }",
|
||||
'urlmap': 'http://www.bing.com/search?q=|',
|
||||
'regexmap': '^(http:\/\/www\.bing\.com\/search\?[^&]*q=)([^&]*)(.*)$',
|
||||
'host': '(www\.bing\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& al.indexOf('http')==0&& al.indexOf('https')!=0 && al.indexOf('msn')<0 && al.indexOf('live')<0 && al.indexOf('bing')<0&& al.indexOf('microsoft')<0 && al.indexOf('WindowsLiveTranslator')<0 ) }",
|
||||
'box': SearchBox_bing,
|
||||
'button': getButton_bing
|
||||
},
|
||||
{
|
||||
'id': 'baidu',
|
||||
'name': 'Baidu Search',
|
||||
'urlmap':"http://www.baidu.com/s?wd=|",
|
||||
'regexmap':"^(http:\/\/www\.baidu\.com\/s\?.*?wd=)([^&]*)(.*)$",
|
||||
"host":"(www\.baidu\.com)$",
|
||||
"testad":"let testad = function(ac,al) {return ( al&& al.indexOf('baidu')<0 && al.indexOf('https')!=0);}",
|
||||
'urlmap': 'http://www.baidu.com/s?wd=|',
|
||||
'regexmap': '^(http:\/\/www\.baidu\.com\/s\?.*?wd=)([^&]*)(.*)$',
|
||||
'host': '(www\.baidu\.com)$',
|
||||
'testad': "let testad = function(ac,al) {return ( al&& al.indexOf('baidu')<0 && al.indexOf('https')!=0);}",
|
||||
'box': SearchBox_baidu,
|
||||
'button': getButton_baidu
|
||||
},
|
||||
{
|
||||
'id': 'aol',
|
||||
'name': 'Aol Search',
|
||||
'urlmap':"http://search.aol.com/aol/search?q=|",
|
||||
'regexmap':"^(http:\/\/[a-z0-9.]*?search\.aol\.com\/aol\/search\?.*?q=)([^&]*)(.*)$",
|
||||
"host":"([a-z0-9.]*?search\.aol\.com)$",
|
||||
"testad":"let testad = function(ac,al){return(ac=='\"find\"'||ac=='find'&& al.indexOf('https')!=0 && al.indexOf('aol')<0 );}",
|
||||
'urlmap': 'http://search.aol.com/aol/search?q=|',
|
||||
'regexmap': '^(http:\/\/[a-z0-9.]*?search\.aol\.com\/aol\/search\?.*?q=)([^&]*)(.*)$',
|
||||
'host': '([a-z0-9.]*?search\.aol\.com)$',
|
||||
'testad': "let testad = function(ac,al){return(ac=='\"find\"'||ac=='find'&& al.indexOf('https')!=0 && al.indexOf('aol')<0 );}",
|
||||
'box': SearchBox_aol,
|
||||
'button': getButton_aol
|
||||
},
|
||||
{
|
||||
'id': 'ddg',
|
||||
'name': 'DuckDuckGo Search',
|
||||
'urlmap':"http://duckduckgo.com/?q=|",
|
||||
'regexmap':"^(http:\/\/duckduckgo\.com\/?q=)([^&]*)(.*)$"
|
||||
'urlmap': 'http://duckduckgo.com/?q=|',
|
||||
'regexmap': '^(http:\/\/duckduckgo\.com\/?q=)([^&]*)(.*)$'
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -1311,9 +1246,9 @@ TRACKMENOT.TMNSearch = function() {
|
|||
function initFeeds() {
|
||||
TMNQueries.extracted = [];
|
||||
if (!load_full_pages) {
|
||||
stop_when = "start";
|
||||
stop_when = 'start';
|
||||
} else {
|
||||
stop_when = "end";
|
||||
stop_when = 'end';
|
||||
}
|
||||
|
||||
if (useRss) {
|
||||
|
|
@ -1354,29 +1289,29 @@ TRACKMENOT.TMNSearch = function() {
|
|||
tmn_logged_id = entry.id;
|
||||
}
|
||||
let now = new Date();
|
||||
entry.date = formatNum(now.getHours())+":"+ formatNum(now.getMinutes())+":"+ formatNum(now.getSeconds())+
|
||||
entry.date = formatNum(now.getHours()) + ':' + formatNum(now.getMinutes()) + ':' + formatNum(now.getSeconds()) +
|
||||
' ' + (now.getMonth() + 1) + '/' + now.getDate() + '/' + now.getFullYear();
|
||||
}
|
||||
}
|
||||
catch (ex) {
|
||||
console.log ("[ERROR] "+ ex +" / "+ ex.message + "\nlogging msg");
|
||||
console.log('[ERROR] ' + ex + ' / ' + ex.message + '\nlogging msg');
|
||||
}
|
||||
tmnLogs.unshift(entry);
|
||||
browser.storage.local.set({
|
||||
"logs_tmn": JSON.stringify(tmnLogs)
|
||||
'logs_tmn': JSON.stringify(tmnLogs)
|
||||
});
|
||||
}
|
||||
|
||||
function sendClickEvent() {
|
||||
if (prev_engine) {
|
||||
console.log ("About to click on " + prev_engine);
|
||||
console.log('About to click on ' + prev_engine);
|
||||
browser.tabs.sendMessage(tmn_tab_id, {tmn_engine: getEngineById(prev_engine)});
|
||||
}
|
||||
}
|
||||
|
||||
function handleRequest(request, sender, sendResponse) {
|
||||
if (request.tmnLog) {
|
||||
console.log ("Background logging : " + request.tmnLog);
|
||||
console.log('Background logging: ' + request.tmnLog);
|
||||
let logtext = JSON.parse(request.tmnLog);
|
||||
log(logtext);
|
||||
sendResponse({});
|
||||
|
|
@ -1397,22 +1332,22 @@ TRACKMENOT.TMNSearch = function() {
|
|||
let tmp_engine = request.getURLMap;
|
||||
let urlMap = currentUrlMap[tmp_engine];
|
||||
sendResponse({
|
||||
"url": urlMap
|
||||
'url': urlMap
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (request.setURLMap) {
|
||||
console.log ("Background handling : " + request.setURLMap);
|
||||
console.log('Background handling: ' + request.setURLMap);
|
||||
let vars = request.setURLMap.split('--');
|
||||
let eng = vars[0];
|
||||
let asearch = vars[1];
|
||||
currentUrlMap[eng] = asearch;
|
||||
browser.storage.local.set({
|
||||
"url_map_tmn": JSON.stringify(currentUrlMap)
|
||||
'url_map_tmn': JSON.stringify(currentUrlMap)
|
||||
});
|
||||
let logEntry = {
|
||||
'type': 'URLmap',
|
||||
"engine" : eng,
|
||||
'engine': eng,
|
||||
'newUrl': asearch
|
||||
};
|
||||
log(logEntry);
|
||||
|
|
@ -1421,17 +1356,17 @@ TRACKMENOT.TMNSearch = function() {
|
|||
}
|
||||
//console.log ("Background page received message: " + request.tmn);
|
||||
switch (request.tmn) {
|
||||
case "currentURL":
|
||||
case 'currentURL':
|
||||
sendResponse({
|
||||
"url": currentTMNURL
|
||||
'url': currentTMNURL
|
||||
});
|
||||
break;
|
||||
case "useTab" :
|
||||
case 'useTab' :
|
||||
sendResponse({
|
||||
"tmnUseTab": useTab
|
||||
'tmnUseTab': useTab
|
||||
});
|
||||
break;
|
||||
case "pageLoaded": //Remove timer and then reschedule;
|
||||
case 'pageLoaded': //Remove timer and then reschedule;
|
||||
if (last_url == request.url) break;
|
||||
else last_url = request.url;
|
||||
prev_engine = engine;
|
||||
|
|
@ -1446,39 +1381,39 @@ TRACKMENOT.TMNSearch = function() {
|
|||
} catch (ex) {}
|
||||
sendResponse({});
|
||||
break;
|
||||
case "tmnError": //Remove timer and then reschedule;
|
||||
case 'tmnError': //Remove timer and then reschedule;
|
||||
clearTimeout(tmn_errTimeout);
|
||||
rescheduleOnError();
|
||||
sendResponse({});
|
||||
break;
|
||||
case "isActiveTab":
|
||||
case 'isActiveTab':
|
||||
let active = (!sender.tab || sender.tab.id == tmn_tab_id);
|
||||
sendResponse(
|
||||
{"isActive": active}
|
||||
{'isActive': active}
|
||||
);
|
||||
break;
|
||||
case "TMNSaveOptions":
|
||||
case 'TMNSaveOptions':
|
||||
saveOptionFromTab(request.option);
|
||||
sendResponse({});
|
||||
break;
|
||||
case "TMNSaveUserlist":
|
||||
case 'TMNSaveUserlist':
|
||||
saveUserlist(request.option);
|
||||
sendResponse({});
|
||||
break;
|
||||
case "TMNResetOptions":
|
||||
case 'TMNResetOptions':
|
||||
resetOptions();
|
||||
sendResponse({});
|
||||
break;
|
||||
case "TMNValideFeeds":
|
||||
case 'TMNValideFeeds':
|
||||
validateFeeds(request.param);
|
||||
sendResponse({});
|
||||
break;
|
||||
case "TMNAddEngine":
|
||||
case 'TMNAddEngine':
|
||||
console.log(request.engine);
|
||||
addEngine(request.engine);
|
||||
sendResponse({});
|
||||
break;
|
||||
case "TMNDelEngine":
|
||||
case 'TMNDelEngine':
|
||||
delEngine(request.engine);
|
||||
sendResponse({});
|
||||
break;
|
||||
|
|
@ -1529,7 +1464,7 @@ TRACKMENOT.TMNSearch = function() {
|
|||
deleteTab();
|
||||
}
|
||||
if (!saveLogs)
|
||||
browser.storage.local.set({"logs_tmn" : ""});
|
||||
browser.storage.local.set({'logs_tmn': ''});
|
||||
});
|
||||
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in a new issue