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
34 changes: 21 additions & 13 deletions src/blocker.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
var currentPatterns = [];

function blockRequest(details) {
console.log("Blocked: ", details.url);
if (probability > Math.random()) {
console.log("Blocked: ", details.url);
return {
cancel: true
};
}
console.log("Not blocked: ", details.url);
return {
cancel: true
cancel: false
};
}

Expand All @@ -12,12 +16,12 @@ function isValidPattern(urlPattern) {
return !!urlPattern.match(validPattern);
}

function updateFilters() {
function updateFilters(urls) {
if (chrome.webRequest.onBeforeRequest.hasListener(blockRequest)) {
chrome.webRequest.onBeforeRequest.removeListener(blockRequest);
}

var validPatterns = currentPatterns.filter(isValidPattern);
var validPatterns = patterns.filter(isValidPattern);

if (validPatterns.length) {
try{
Expand All @@ -31,23 +35,27 @@ function updateFilters() {
}

function load(callback) {
chrome.storage.sync.get('blocked_patterns', function(data) {
callback(data['blocked_patterns'] || []);
chrome.storage.sync.get(['blocked_patterns', 'probability'], function(data) {
callback(data['blocked_patterns'] || [], data['probability'] || 1);
});
}

function save(newPatterns, callback) {
currentPatterns = newPatterns;
function save(newPatterns, newProbability, callback) {
patterns = newPatterns;
probability = newProbability;

chrome.storage.sync.set({
'blocked_patterns': newPatterns
'blocked_patterns': newPatterns,
'probability': probability
}, function() {
updateFilters();
callback.call();
});
}

load(function(patterns) {
currentPatterns = patterns;
load(function(pat, prob) {
patterns = pat;
probability = prob;
updateFilters();
});

Expand Down
8 changes: 8 additions & 0 deletions src/popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ <h3>{{patterns.length}} Pattern(s) (<a href="javascript:void(0)" ng-click="add()
<p class="bg-warning text-warning">Url patterns must comply with the format specified at <a href="https://developer.chrome.com/extensions/match_patterns">https://developer.chrome.com/extensions/match_patterns</a> (ex: <strong>*://evilsite.com/*</strong>).
Invalid patterns will be ignored.</p>

<hr />

<div class="form-group">
<label for="probability">Probability</label>
<input type="number" min="0.0" max="1.0" step="0.1" class="form-control" ng-model="probability" />
</div>


<hr />

<div>
Expand Down
7 changes: 5 additions & 2 deletions src/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ app.controller('PopupController', function($scope) {
}
};
});
$scope.probability = $scope.backgroundPage.probability;

$scope.remove = function(patternToRemove) {
var index = $scope.patterns.indexOf(patternToRemove);
Expand All @@ -37,9 +38,11 @@ app.controller('PopupController', function($scope) {
return x.pattern;
});

$scope.backgroundPage.save(patterns, function() {
var probability = $scope.probability;

$scope.backgroundPage.save(patterns, probability, function() {
$scope.$apply(function() {
$scope.success('Patterns saved successfully!');
$scope.success('Patterns saved successfully!!');
});
});
};
Expand Down