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

fix https://www.reddit.com/r/uBlockOrigin/comments/8dkvqn/116_broken_loading_custom_filters_from_my_filters/

This commit is contained in:
Raymond Hill 2018-04-21 12:34:54 -04:00
parent 26e5b3f45d
commit 5386558e68
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/chromium/vapi-background.js
View File

@ -49,6 +49,12 @@ vAPI.resetLastError = function() {
}; };
vAPI.supportsUserStylesheets = vAPI.webextFlavor.soup.has('user_stylesheet'); vAPI.supportsUserStylesheets = vAPI.webextFlavor.soup.has('user_stylesheet');
// The real actual webextFlavor value may not be set in stone, so listen
// for possible future changes.
window.addEventListener('webextFlavor', function() {
vAPI.supportsUserStylesheets =
vAPI.webextFlavor.soup.has('user_stylesheet');
}, { once: true });
vAPI.insertCSS = function(tabId, details) { vAPI.insertCSS = function(tabId, details) {
return chrome.tabs.insertCSS(tabId, details, vAPI.resetLastError); return chrome.tabs.insertCSS(tabId, details, vAPI.resetLastError);
@ -721,8 +727,7 @@ vAPI.messaging.listen = function(listenerName, callback) {
/******************************************************************************/ /******************************************************************************/
vAPI.messaging.onPortMessage = (function() { vAPI.messaging.onPortMessage = (function() {
var messaging = vAPI.messaging, var messaging = vAPI.messaging;
supportsUserStylesheets = vAPI.supportsUserStylesheets;
// Use a wrapper to avoid closure and to allow reuse. // Use a wrapper to avoid closure and to allow reuse.
var CallbackWrapper = function(port, request) { var CallbackWrapper = function(port, request) {
@ -806,7 +811,7 @@ vAPI.messaging.onPortMessage = (function() {
frameId: sender.frameId, frameId: sender.frameId,
matchAboutBlank: true matchAboutBlank: true
}; };
if ( supportsUserStylesheets ) { if ( vAPI.supportsUserStylesheets ) {
details.cssOrigin = 'user'; details.cssOrigin = 'user';
} }
if ( msg.add ) { if ( msg.add ) {

2
platform/chromium/vapi-common.js
View File

@ -69,7 +69,9 @@ vAPI.webextFlavor = {
flavor.major = parseInt(info.version, 10) || 0; flavor.major = parseInt(info.version, 10) || 0;
soup.add(info.vendor.toLowerCase()) soup.add(info.vendor.toLowerCase())
.add(info.name.toLowerCase()); .add(info.name.toLowerCase());
soup.delete('user_stylesheet');
if ( flavor.major >= 53 ) { soup.add('user_stylesheet'); } if ( flavor.major >= 53 ) { soup.add('user_stylesheet'); }
soup.delete('html_filtering');
if ( flavor.major >= 57 ) { soup.add('html_filtering'); } if ( flavor.major >= 57 ) { soup.add('html_filtering'); }
dispatch(); dispatch();
}); });

5
src/js/cosmetic-filtering.js
View File

@ -543,6 +543,11 @@ FilterContainer.prototype.freeze = function() {
this.highlyGeneric.simple.str = µb.arrayFrom(this.highlyGeneric.simple.dict).join(',\n'); this.highlyGeneric.simple.str = µb.arrayFrom(this.highlyGeneric.simple.dict).join(',\n');
this.highlyGeneric.complex.str = µb.arrayFrom(this.highlyGeneric.complex.dict).join(',\n'); this.highlyGeneric.complex.str = µb.arrayFrom(this.highlyGeneric.complex.dict).join(',\n');
// https://www.reddit.com/r/uBlockOrigin/comments/8dkvqn/116_broken_loading_custom_filters_from_my_filters/
// Just in case. This can be removed once Firefox 60 ESR is out
// and widespread.
this.supportsUserStylesheets = vAPI.supportsUserStylesheets;
this.frozen = true; this.frozen = true;
}; };