Skip to content

Commit

Permalink
optomised functions and removed <all_urls> #18
Browse files Browse the repository at this point in the history
  • Loading branch information
@zekrom-vale
zekrom-vale committed Jun 28, 2017
1 parent 39a8b75 commit 297f30a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 77 deletions.
2 changes: 0 additions & 2 deletions Extension/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"*://*.tv/*",
"https://www.vevo.com/watch/*",
"http://www.veoh.com//*",
"*://*/*",
"file://*/*"
],
"content_scripts": [{
Expand All @@ -77,7 +76,6 @@
"*://*.tv/*",
"https://www.vevo.com/watch/*",
"http://www.veoh.com/*",
"*://*/*",
"file://*/*"
],
"exclude_matches": [
Expand Down
36 changes: 12 additions & 24 deletions Extension/popup/optionFile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,39 @@ document.addEventListener('DOMContentLoaded', ()=>{
});
//Listen
DLMN.addEventListener('change', ()=>{
var url=["http://www.dailymotion.com/video/*"];
DLMN.checked? reQuest(url, DLMN): dePre(url, DLMN);
pros(["http://www.dailymotion.com/video/*"], DLMN);
});
HLU.addEventListener('change', ()=>{
var url=["https://www.hulu.com/*"];
HLU.checked? reQuest(url, HLU): dePre(url, HLU);
pros(["https://www.hulu.com/*"], HLU);
});
VIM.addEventListener('change', ()=>{
var url=["https://vimeo.com/*"];
VIM.checked? reQuest(url, VIM): dePre(url, VIM);
pros(["https://vimeo.com/*"], VIM);
});
LIVE.addEventListener('change', ()=>{
var url=["https://www.liveleak.com/view*"];
LIVE.checked? reQuest(url, LIVE): dePre(url, LIVE);
pros(["https://www.liveleak.com/view*"], LIVE);
});
BRK.addEventListener('change', ()=>{
var url=["http://www.break.com/video/*"];
BRK.checked? reQuest(url, BRK): dePre(url, BRK);
pros(["http://www.break.com/video/*"], BRK);
});
FLIX.addEventListener('change', ()=>{
var url=["https://www.netflix.com/"];
FLIX.checked? reQuest(url, FLIX): dePre(url, FLIX);
pros(["https://www.netflix.com/"], FLIX);
});
VINE.addEventListener('change', ()=>{
var url=["https://vine.co/*"];
VINE.checked? reQuest(url, VINE): dePre(url, VINE);
pros(["https://vine.co/*"], VINE);
});
YAH.addEventListener('change', ()=>{
var url=["https://view.yahoo.com/show/*"];
YAH.checked? reQuest(url, YAH): dePre(url, YAH);
pros(["https://view.yahoo.com/show/*"], YAH);
});
VIE.addEventListener('change', ()=>{
var url=["http://www.viewster.com/serie/*"];
VIE.checked? reQuest(url, VIE): dePre(url, VIE);
pros(["http://www.viewster.com/serie/*"], VIE);
});
DTV.addEventListener('change', ()=>{
var url=["*://*.tv/*"];
DTV.checked? reQuest(url, DTV): dePre(url, DTV);
pros(["*://*.tv/*"], DTV);
});
VEV.addEventListener('change', ()=>{
var url=["https://www.vevo.com/watch/*"];
VEV.checked? reQuest(url, VEV): dePre(url, VEV);
pros(["https://www.vevo.com/watch/*"], VEV);
});
VEHO.addEventListener('change', ()=>{
var url=["http://www.veoh.com/*"];
VEHO.checked? reQuest(url, VEHO): dePre(url, VEHO);
pros(["http://www.veoh.com/*"], VEHO);
});
});
77 changes: 26 additions & 51 deletions Extension/popup/permit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,70 +18,45 @@ document.addEventListener('DOMContentLoaded', ()=>{
});
//End Set //Listen
YTB.addEventListener('change', ()=>{
var url=["https://www.youtube.com/watch*"];
YTB.checked? reQuest(url, YTB): dePre(url, YTB);
pros(["https://www.youtube.com/watch*"], YTB);
});
GAME.addEventListener('change', ()=>{
var url= ["https://gaming.youtube.com/watch*"];
GAME.checked? reQuest(url, GAME): dePre(url, GAME);
pros(["https://gaming.youtube.com/watch*"], GAME);
});
EMB.addEventListener('change', ()=>{
var url= ["https://www.youtube-nocookie.com/embed/*"/*, "https://www.youtube.com/embed/*"*/];
EMB.checked? reQuest(url, EMB): dePre(url, EMB);
pros(url, EMB);
});
TWCH.addEventListener('change', ()=>{
var url= ["https://www.twitch.tv/videos/*"];
TWCH.checked? reQuest(url, TWCH): dePre(url, TWCH);
pros(["https://www.twitch.tv/videos/*"], TWCH);
});
FILE.addEventListener('change', ()=>{
var url= ["file://*/*"];
FILE.checked? reQuest(url, FILE): dePre(url, FILE);
pros(["file://*/*"], FILE);
});
ALL.addEventListener('change', ()=>{
url= ["*://*/*"];
ALL.checked? reQuest(url, ALL): dePre(url, ALL);
pros(["*://*/*"], ALL);
permReSet(ALL.checked);
});
});
//! Any path is ignored.
function reQuest(url, ent){
chrome.permissions.request({
origins: url
}, granted=>{
if(!granted) {
ent.checked= false;
setErr(401, `"${ent.id}"`);
}
});
}
function dePre(url, ent){
chrome.permissions.remove({
origins: url
}, removed=>{
if(!removed){
ent.checked= true;
setErr(404.1, `"${ent.id}"`);
}
});
}
function permReSet(trlse){
with(document){
getElementById('YouTube').checked= trlse;
getElementById('Game').checked= trlse;
getElementById('Embed').checked= trlse;
getElementById('Twitch').checked= trlse;
getElementById('All').checked= trlse;
getElementById('Dailymotion').checked= trlse;
getElementById('hulu').checked= trlse;
getElementById('Vimeo').checked= trlse;
getElementById('Liveleak').checked= trlse;
getElementById('Break').checked= trlse;
getElementById('Netflix').checked= trlse;
getElementById('Vine').checked= trlse;
getElementById('Yahoo2').checked= trlse;
getElementById('Viewster').checked= trlse;
getElementById('Dot_tv').checked= trlse;
getElementById('Vevo').checked= trlse;
getElementById('Veoh').checked= trlse;
function pros(url, ent){
if(ent.checked){
chrome.permissions.request({
origins: url
}, granted=>{
if(!granted) {
ent.checked= false;
setErr(401, `"${ent.id}"`);
}
});
}
else{
chrome.permissions.remove({
origins: url
}, removed=>{
if(!removed){
ent.checked= true;
setErr(404.1, `"${ent.id}"`);
}
});
}
}

0 comments on commit 297f30a

Please sign in to comment.