Skip to content

Repair some meta and relax detection a bit. #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martii merged 1 commit into from
Jul 2, 2019
Merged

Repair some meta and relax detection a bit. #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion controllers/scriptStorage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ if (!mediaDB['image/jxr']) {
});
}

// Allow some Chromium based browsers to test
if (!mediaDB['application/signed-exchange']) {
mediaDB = _.extend(mediaDB, {
'application/signed-exchange' : {
source: 'google',
extensions: []
}
});
}

if (!mediaDB['*/*']) {
mediaDB = _.extend(mediaDB, {'*/*' : { source: 'iana'}});
Expand Down Expand Up @@ -550,7 +559,7 @@ exports.sendScript = function (aReq, aRes, aNext) {
let matches = null;
let rAnyLocalMetaUrl = new RegExp(
'^' + patternHasSameOrigin +
'/(?:meta|install|src/scripts)/(.+?)/(.+?)\.meta\.js$'
'/(?:meta|install|src/scripts)/(.+?)/(.+?)\.(?:meta|user)\.js$'
);
let hasAlternateLocalUpdateURL = false;

Expand Down
2 changes: 1 addition & 1 deletion libs/modelParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ var parseScript = function (aScript) {
);
var rAnyLocalMetaUrl = new RegExp(
'^' + patternHasSameOrigin +
'/(?:meta|install|src/scripts)/(.+?)/(.+?)\.meta\.js$'
'/(?:meta|install|src/scripts)/(.+?)/(.+?)\.(?:meta|user)\.js$'
);

var rSameOrigin = new RegExp(
Expand Down