Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor code review re. #150

This commit is contained in:
gorhill 2015-04-29 12:03:06 -04:00
parent 52b2868c74
commit 6fcad5dc9f
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/uritools.js
View File

@ -376,7 +376,7 @@ var domainCacheCount = 0;
var domainCacheCountLowWaterMark = 75;
var domainCacheCountHighWaterMark = 100;
psl.onModified.addListener(domainCacheReset);
psl.onChanged.addListener(domainCacheReset);
/******************************************************************************/

39
src/lib/publicsuffixlist.js
View File

@ -47,7 +47,7 @@ var selfieMagic = 'iscjsfsaolnm';
var cutoffLength = 256;
var mustPunycode = /[^a-z0-9.-]/;
var onModifyListeners = [];
var onChangedListeners = [];
/******************************************************************************/
@ -238,8 +238,7 @@ function parse(text, toAscii) {
}
crystallize(exceptions);
crystallize(rules);
callListeners(onModifyListeners);
callListeners(onChangedListeners);
}
/******************************************************************************/
@ -308,12 +307,28 @@ function fromSelfie(selfie) {
}
rules = selfie.rules;
exceptions = selfie.exceptions;
callListeners(onModifyListeners);
callListeners(onChangedListeners);
return true;
}
/******************************************************************************/
var addListener = function(listeners, callback) {
if ( typeof callback !== 'function' ) {
return;
}
if ( listeners.indexOf(callback) === -1 ) {
listeners.push(callback);
}
};
var removeListener = function(listeners, callback) {
var pos = listeners.indexOf(callback);
if ( pos !== -1 ) {
listeners.splice(pos, 1);
}
};
var callListeners = function(listeners) {
for ( var i = 0; i < listeners.length; i++ ) {
listeners[i]();
@ -322,20 +337,12 @@ var callListeners = function(listeners) {
/******************************************************************************/
var onModified = {
var onChanged = {
addListener: function(callback) {
if (
typeof callback === 'function' &&
onModifyListeners.indexOf(callback) === -1
) {
onModifyListeners.push(callback);
}
addListener(onChangedListeners, callback);
},
removeListener: function(callback) {
var pos = onModifyListeners.indexOf(callback);
if ( pos !== -1 ) {
onModifyListeners.splice(pos, 1);
}
removeListener(onChangedListeners, callback);
}
};
@ -352,7 +359,7 @@ root.publicSuffixList = {
'getPublicSuffix': getPublicSuffix,
'toSelfie': toSelfie,
'fromSelfie': fromSelfie,
'onModified': onModified
'onChanged': onChanged
};
/******************************************************************************/