Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2024-05-08 21:26:21 +08:00
commit f00e5ffc7d
3 changed files with 21 additions and 6 deletions

View file

@ -20,7 +20,7 @@
}
#main-window[customize-entered] {
min-width: -moz-fit-content;
min-width: fit-content;
}
searchbar {

View file

@ -1076,11 +1076,26 @@ var gApplicationsPane = {
if (mimeType.type in this._handledTypes) {
handlerInfoWrapper = this._handledTypes[mimeType.type];
} else {
let wrappedHandlerInfo =
if (mimeType.type == '') {
// If an incorrect empty MIME type is present, don't break.
continue;
}
try {
let wrappedHandlerInfo =
this._mimeSvc.getFromTypeAndExtension(mimeType.type, null);
handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
handlerInfoWrapper.handledOnlyByPlugin = true;
this._handledTypes[mimeType.type] = handlerInfoWrapper;
handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
handlerInfoWrapper.handledOnlyByPlugin = true;
this._handledTypes[mimeType.type] = handlerInfoWrapper;
#ifdef DEBUG
console.log("Enumerate MIME type: " + mimeType.type);
#endif
} catch(e) {
#ifdef DEBUG
console.log("Error fetching MIME type info for " + mimeType.type);
console.log(e);
#endif
continue;
}
}
handlerInfoWrapper.pluginName = mimeType.enabledPlugin.name;
}

View file

@ -11,7 +11,7 @@ browser.jar:
* content/browser/preferences/in-content/privacy.js
content/browser/preferences/in-content/containers.js
content/browser/preferences/in-content/advanced.js
content/browser/preferences/in-content/applications.js
* content/browser/preferences/in-content/applications.js
* content/browser/preferences/in-content/content.js
#ifdef MOZ_SERVICES_SYNC
content/browser/preferences/in-content/sync.js