mirror of
https://github.com/zen-browser/desktop.git
synced 2026-04-02 21:59:18 +00:00
Merge branch 'dev' into library
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -24,3 +24,4 @@ target/
|
||||
locales/firefox-l10n/
|
||||
|
||||
!src/toolkit/themes/shared/design-system/dist/
|
||||
.DS_Store
|
||||
|
||||
@@ -147,7 +147,8 @@ export class nsZenLiveFolderProvider {
|
||||
contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD,
|
||||
loadingPrincipal: principal,
|
||||
securityFlags:
|
||||
Ci.nsILoadInfo.SEC_REQUIRE_CORS_INHERITS_SEC_CONTEXT | Ci.nsILoadInfo.SEC_COOKIES_INCLUDE,
|
||||
Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL |
|
||||
Ci.nsILoadInfo.SEC_COOKIES_INCLUDE,
|
||||
triggeringPrincipal: principal,
|
||||
}).QueryInterface(Ci.nsIHttpChannel);
|
||||
|
||||
|
||||
@@ -407,6 +407,9 @@ class nsZenLiveFoldersManager {
|
||||
});
|
||||
// createLazyBrowser can't be pinned by default
|
||||
this.window.gBrowser.pinTab(tab);
|
||||
if (userContextId) {
|
||||
tab.setAttribute("zenDefaultUserContextId", "true");
|
||||
}
|
||||
if (item.icon) {
|
||||
this.window.gBrowser.setIcon(tab, item.icon);
|
||||
if (tab.linkedBrowser) {
|
||||
|
||||
@@ -111,6 +111,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
|
||||
_onTabResetPinButton(event, tab) {
|
||||
event.stopPropagation();
|
||||
this._resetTabToStoredState(tab);
|
||||
gBrowser.selectedTab = tab;
|
||||
}
|
||||
|
||||
get enabled() {
|
||||
|
||||
Reference in New Issue
Block a user