Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:gorhill/uBlock

Browse Source
This commit is contained in:
gorhill 2015-03-16 07:05:42 -04:00
commit bb1e131ae7
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/firefox/vapi-background.js
View File

@ -455,11 +455,9 @@ vAPI.tabs.getTabId = function(target) {
if ( vAPI.fennec ) {
if ( target.browser ) {
// target is a tab
return target.browser.loadContext.DOMWindowID;
target = target.browser;
}
return target.loadContext.DOMWindowID;
return -1;
}
if ( target.linkedPanel ) {

38
platform/firefox/vapi-common.js
View File

@ -120,21 +120,35 @@ vAPI.closePopup = function() {
// This storage is optional, but it is nice to have, for a more polished user
// experience.
Object.defineProperty(vAPI, 'localStorage', {
get: function() {
if ( this._localStorage ) {
return this._localStorage;
vAPI.localStorage = {
PB: Services.prefs.getBranch('extensions.' + location.host + '.'),
str: Components.classes['@mozilla.org/supports-string;1']
.createInstance(Components.interfaces.nsISupportsString),
getItem: function(key) {
try {
return this.PB.getComplexValue(
key,
Components.interfaces.nsISupportsString
).data;
} catch (ex) {
return null;
}
this._localStorage = Services.domStorageManager.getLocalStorageForPrincipal(
Services.scriptSecurityManager.getCodebasePrincipal(
Services.io.newURI('http://ublock.raymondhill.net/', null, null)
),
''
},
setItem: function(key, value) {
this.str.data = value;
this.PB.setComplexValue(
key,
Components.interfaces.nsISupportsString,
this.str
);
return this._localStorage;
},
removeItem: function(key) {
this.PB.clearUserPref(key);
},
clear: function() {
this.PB.deleteBranch('');
}
});
};
/******************************************************************************/

22
src/js/subscriber.js
View File

@ -37,7 +37,7 @@
// https://github.com/gorhill/uBlock/issues/464
if ( document instanceof HTMLDocument === false ) {
//console.debug('contentscript-start.js > not a HTLMDocument');
return false;
return;
}
// Because in case
@ -52,7 +52,7 @@ if ( !vAPI ) {
// The links look like this:
// abp:subscribe?location=https://easylist-downloads.adblockplus.org/easyprivacy.txt[...]
if ( document.querySelector('[href^="abp:subscribe?"]') === null ) {
if ( document.querySelector('a[href^="abp:"]') === null ) {
return;
}
@ -66,14 +66,16 @@ var onAbpLinkClicked = function(ev) {
if ( ev.button !== 0 ) {
return;
}
var receiver = ev.target;
if ( receiver === null ) {
return;
}
if ( receiver.tagName.toLowerCase() !== 'a' ) {
return;
}
var href = receiver.getAttribute('href') || '';
var target = ev.target;
var limit = 3;
var href = '';
do {
if ( target instanceof HTMLAnchorElement ) {
href = target.href;
break;
}
target = target.parentNode;
} while ( target && --limit );
if ( href === '' ) {
return;
}