mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-25 00:27:29 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
f00e5ffc7d
3 changed files with 21 additions and 6 deletions
|
|
@ -20,7 +20,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-window[customize-entered] {
|
#main-window[customize-entered] {
|
||||||
min-width: -moz-fit-content;
|
min-width: fit-content;
|
||||||
}
|
}
|
||||||
|
|
||||||
searchbar {
|
searchbar {
|
||||||
|
|
|
||||||
|
|
@ -1076,11 +1076,26 @@ var gApplicationsPane = {
|
||||||
if (mimeType.type in this._handledTypes) {
|
if (mimeType.type in this._handledTypes) {
|
||||||
handlerInfoWrapper = this._handledTypes[mimeType.type];
|
handlerInfoWrapper = this._handledTypes[mimeType.type];
|
||||||
} else {
|
} 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);
|
this._mimeSvc.getFromTypeAndExtension(mimeType.type, null);
|
||||||
handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
|
handlerInfoWrapper = new HandlerInfoWrapper(mimeType.type, wrappedHandlerInfo);
|
||||||
handlerInfoWrapper.handledOnlyByPlugin = true;
|
handlerInfoWrapper.handledOnlyByPlugin = true;
|
||||||
this._handledTypes[mimeType.type] = handlerInfoWrapper;
|
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;
|
handlerInfoWrapper.pluginName = mimeType.enabledPlugin.name;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ browser.jar:
|
||||||
* content/browser/preferences/in-content/privacy.js
|
* content/browser/preferences/in-content/privacy.js
|
||||||
content/browser/preferences/in-content/containers.js
|
content/browser/preferences/in-content/containers.js
|
||||||
content/browser/preferences/in-content/advanced.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
|
* content/browser/preferences/in-content/content.js
|
||||||
#ifdef MOZ_SERVICES_SYNC
|
#ifdef MOZ_SERVICES_SYNC
|
||||||
content/browser/preferences/in-content/sync.js
|
content/browser/preferences/in-content/sync.js
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue