Commit ed6af858 authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

Merge tag 'debian/1%78.6.0-1' into debian/buster

thunderbird Debian release 1:78.6.0-1
parents 587270c2 cb969bf2
......@@ -898,9 +898,9 @@ dependencies = [
[[package]]
name = "cssparser"
version = "0.27.2"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
checksum = "809d22aba9ffd53e9028f2d37261f1826ef613d0e96b1a5ddeefa97cde82bcca"
dependencies = [
"cssparser-macros",
"dtoa-short",
......
......@@ -1455,9 +1455,11 @@ var Policies = {
"layout.",
"media.",
"network.",
"pdfjs.",
"places.",
"print.",
"signon.",
"spellchecker.",
"ui.",
"widget.",
];
......@@ -2219,6 +2221,7 @@ function replacePathVariables(path) {
function installAddonFromURL(url, extensionID, addon) {
if (
addon &&
addon.sourceURI &&
addon.sourceURI.spec == url &&
!addon.sourceURI.schemeIs("file")
) {
......
......@@ -105,14 +105,18 @@ let WebsiteFilter = {
shouldLoad(contentLocation, loadInfo, mimeTypeGuess) {
let contentType = loadInfo.externalContentPolicyType;
let url = contentLocation.spec;
if (contentLocation.scheme == "view-source") {
url = contentLocation.pathQueryRef;
}
if (
contentType == Ci.nsIContentPolicy.TYPE_DOCUMENT ||
contentType == Ci.nsIContentPolicy.TYPE_SUBDOCUMENT
) {
if (this._blockPatterns.matches(contentLocation.spec.toLowerCase())) {
if (this._blockPatterns.matches(url.toLowerCase())) {
if (
!this._exceptionsPatterns ||
!this._exceptionsPatterns.matches(contentLocation.spec.toLowerCase())
!this._exceptionsPatterns.matches(url.toLowerCase())
) {
return Ci.nsIContentPolicy.REJECT_POLICY;
}
......
......@@ -18,6 +18,10 @@ add_task(async function test_http() {
});
await checkBlockedPage(SUPPORT_FILES_PATH + BLOCKED_PAGE, true);
await checkBlockedPage(
"view-source:" + SUPPORT_FILES_PATH + BLOCKED_PAGE,
true
);
await checkBlockedPage(SUPPORT_FILES_PATH + EXCEPTION_PAGE, false);
});
......
......@@ -63,6 +63,7 @@ browser/chrome/browser/res/payments/formautofill/autofillEditForms.js
browser/defaults/settings/pinning/pins.json
browser/defaults/settings/main/example.json
browser/defaults/settings/main/search-default-override-allowlist.json
browser/defaults/settings/main/url-classifier-skip-urls.json
#ifdef MOZ_EME_WIN32_ARTIFACT
gmp-clearkey/0.1/manifest.json
......
......@@ -241,7 +241,7 @@ Function un.UninstallServiceIfNotUsed
; Restore back the registry view
${If} ${RunningX64}
${OrIf} ${IsNativeARM64}
SetRegView lastUsed
SetRegView lastused
${EndIf}
${If} $0 == 0
......
---
GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
GECKO_HEAD_REPOSITORY: https://hg.mozilla.org/releases/mozilla-esr78
GECKO_HEAD_REF: FIREFOX_78_5_0esr_BUILD1
GECKO_HEAD_REV: d482421dc3fe22020f2c57f573ed902f6d302ffa
GECKO_HEAD_REF: FIREFOX_78_6_0esr_BUILD1
GECKO_HEAD_REV: 8e6813a535daf9ef261c2bbb80cb10e9a832d68e
### For comm-central
# GECKO_BASE_REPOSITORY: https://hg.mozilla.org/mozilla-unified
......
......@@ -53,6 +53,16 @@ calIcalProperty.prototype = {
},
get valueAsIcalString() {
let propertyStr = this.innerObject.toICALString();
if (propertyStr.match(/:/g).length == 1) {
// For property containing only one colon, e.g. `GEO:latitude;longitude`,
// the left hand side must be the property name, the right hand side must
// be property value.
return propertyStr.slice(propertyStr.indexOf(":") + 1);
}
// For property containing many or no colons, retrieve the property value
// according to its type. An example is
// `ATTENDEE;MEMBER="mailto:foo@example.com": mailto:bar@example.com`
let type = this.innerObject.type;
return this.innerObject
.getValues()
......
......@@ -33,6 +33,12 @@ var { calendarDeactivator } = ChromeUtils.import(
* startup as the application window is loaded, before tabs are restored.
*/
async function loadCalendarComponent() {
if (loadCalendarComponent.hasBeenCalled) {
cal.ERROR("loadCalendarComponent was called more than once for a single window");
return;
}
loadCalendarComponent.hasBeenCalled = true;
await uninstallLightningAddon();
document
......
......@@ -176,7 +176,8 @@ async function putItemsIntoCal(destCal, aItems, aFilePath) {
let lastError;
let didImportSucceed = true;
let pcal = cal.async.promisifyCalendar(destCal);
// Using wrappedJSObject is a hack that is needed to prevent a proxy error.
let pcal = cal.async.promisifyCalendar(destCal.wrappedJSObject);
for (let item of aItems) {
// XXX prompt when finding a duplicate.
try {
......
......@@ -19,13 +19,10 @@
margin: 0;
}
:root[lwt-tree] #unifinder-searchBox {
:root[lwt-tree] #unifinder-searchBox,
:root[lwt-tree-brighttext] #unifinder-searchBox {
background-color: var(--toolbar-bgcolor);
background-image: none;
color: var(--toolbar-color);
border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
}
:root[lwt-tree-brighttext] #unifinder-searchBox {
border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
border-bottom-color: var(--sidebar-border-color, var(--splitter-color));
}
......@@ -44,10 +44,11 @@
--viewDropshadowBackground: #ffa47d;
}
:root[lwt-tree] {
:root[lwt-tree],
:root[lwt-tree-brighttext] {
--viewColor: var(--sidebar-text-color);
--viewBackground: var(--sidebar-background-color);
--viewBorderColor: var(--sidebar-border-color);
--viewBackground: var(--sidebar-background-color, Field);
--viewBorderColor: var(--sidebar-border-color, var(--splitter-color));
--viewTodayColor: var(--sidebar-highlight-text-color, HighlightText);
--viewTodayBackground: var(--sidebar-highlight-background-color, Highlight);
--viewTodayLabelColor: var(--sidebar-highlight-text-color, HighlightText);
......@@ -56,11 +57,11 @@
--viewMonthCurrentBackground: rgba(0, 0, 0, 0.1);
--viewMonthDayOtherLabelBackground: rgba(0, 0, 0, 0.2);
--viewMonthOtherBackground: rgba(0, 0, 0, 0.1);
--viewMonthDayBoxLabelColor: var(--sidebar-text-color);
--viewMonthDayBoxWeekLabel: var(--sidebar-text-color);
--viewMonthDayBoxLabelColor: var(--sidebar-text-color, FieldText);
--viewMonthDayBoxWeekLabel: var(--sidebar-text-color, FieldText);
--viewMonthDayOtherBackground: rgba(0, 0, 0, 0.2);
--viewOffTimeBackground: rgba(0, 0, 0, 0.15);
--viewTimeBoxColor: var(--sidebar-text-color);
--viewTimeBoxColor: var(--sidebar-text-color, FieldText);
}
:root[lwt-tree-brighttext] {
......@@ -1112,14 +1113,16 @@ radio.calview:not([selected=true]):hover {
font-size: 14px;
}
:root[lwt-tree] .today-navigation-button {
:root[lwt-tree] .today-navigation-button,
:root[lwt-tree-brighttext] .today-navigation-button {
-moz-appearance: none;
-moz-user-focus: normal;
border: 1px solid transparent;
border-radius: var(--toolbarbutton-border-radius);
}
:root[lwt-tree] .today-navigation-button:not([disabled="true"]):hover {
:root[lwt-tree] .today-navigation-button:not([disabled="true"]):hover,
:root[lwt-tree-brighttext] .today-navigation-button:not([disabled="true"]):hover {
background: var(--toolbarbutton-hover-background);
border-color: var(--toolbarbutton-hover-bordercolor);
box-shadow: var(--toolbarbutton-hover-boxshadow);
......
......@@ -75,20 +75,22 @@
}
.today-pane-cycler:hover {
background-color: hsla(0,0%,0%,.1);
background-color: hsla(0, 0%, 0%, 0.1);
color: inherit;
}
.today-pane-cycler:hover:active {
background-color: hsla(0,0%,0%,.2);
background-color: hsla(0, 0%, 0%, 0.2);
}
.today-pane-cycler:-moz-lwtheme-brighttext:hover {
background-color: hsla(0,0%,100%,.2);
.today-pane-cycler:-moz-lwtheme-brighttext:hover,
:root[lwt-tree-brighttext] .today-pane-cycler:hover {
background-color: hsla(0, 0%, 100%, 0.1);
}
.today-pane-cycler:-moz-lwtheme-brighttext:hover:active {
background-color: hsla(0,0%,100%,.3);
.today-pane-cycler:-moz-lwtheme-brighttext:hover:active,
:root[lwt-tree-brighttext] .today-pane-cycler:hover:active {
background-color: hsla(0, 0%, 100%, 0.2);
}
.today-pane-cycler[dir="prev"]:-moz-locale-dir(ltr) > .toolbarbutton-icon,
......
......@@ -70,14 +70,16 @@ checkbox.treenode-checkbox > .checkbox-label-center-box > .checkbox-label-box >
-moz-user-focus: normal;
}
:root[lwt-tree] .view-navigation-button {
:root[lwt-tree] .view-navigation-button,
:root[lwt-tree-brighttext] .view-navigation-button {
-moz-appearance: none;
-moz-user-focus: normal;
border: 1px solid transparent;
border-radius: var(--toolbarbutton-border-radius);
}
:root[lwt-tree] .view-navigation-button:not([disabled="true"]):hover {
:root[lwt-tree] .view-navigation-button:not([disabled="true"]):hover,
:root[lwt-tree-brighttext] .view-navigation-button:not([disabled="true"]):hover {
background: var(--toolbarbutton-hover-background);
border-color: var(--toolbarbutton-hover-bordercolor);
box-shadow: var(--toolbarbutton-hover-boxshadow);
......
......@@ -26,20 +26,21 @@ calendar-minimonth {
--mmDaySelectedTodayBorderColor: #67acd8;
}
:root[lwt-tree] calendar-minimonth {
--mmMainColor: var(--sidebar-text-color);
--mmMainBackground: var(--sidebar-background-color);
:root[lwt-tree] calendar-minimonth,
:root[lwt-tree-brighttext] calendar-minimonth {
--mmMainColor: var(--sidebar-text-color, FieldText);
--mmMainBackground: var(--sidebar-background-color, Field);
--mmHighlightColor: var(--sidebar-highlight-text-color, HighlightText);
--mmHighlightBackground: var(--sidebar-highlight-background-color, Highlight);
--mmHighlightBorderColor: var(--sidebar-highlight-background-color, Highlight);
--mmBoxBackground: var(--sidebar-background-color);
--mmBoxBorderColor: var(--sidebar-background-color);
--mmBoxBackground: var(--sidebar-background-color, Field);
--mmBoxBorderColor: var(--sidebar-background-color, Field);
--mmDayTodayColor: var(--sidebar-highlight-text-color, HighlightText);
--mmDayTodayBackground: var(--sidebar-highlight-background-color, Highlight);
--mmDayTodayBorderColor: var(--sidebar-highlight-text-color, HighlightText);
--mmDayColor: var(--sidebar-text-color);
--mmDayBorderColor: var(--sidebar-background-color);
--mmDayOtherColor: var(--sidebar-text-color);
--mmDayColor: var(--sidebar-text-color, FieldText);
--mmDayBorderColor: var(--sidebar-background-color, Field);
--mmDayOtherColor: var(--sidebar-text-color, FieldText);
--mmDayOtherBackground: rgba(0, 0, 0, 0.1);
--mmDayOtherBorderColor: Transparent;
}
......
......@@ -620,8 +620,7 @@ CalDavCalendar.prototype = {
// for instance) so we'd best re-fetch in order to know
// the current state of the item
// Observers will be notified in getUpdatedItem()
this.getUpdatedItem(parentItem, aListener);
return;
this.safeRefresh();
} else if (response.serverError) {
status = Cr.NS_ERROR_NOT_AVAILABLE;
detail = "Server Replied with " + response.status;
......
......@@ -174,6 +174,11 @@ function test_icalproperty() {
equal(prop.value, "A\\nB");
equal(prop.valueAsIcalString, "A\\\\nB");
equal(prop.valueAsDatetime, null);
prop = svc.createIcalProperty("GEO");
prop.value = "43.4913662534171;12.085559129715";
equal(prop.value, "43.4913662534171;12.085559129715");
equal(prop.valueAsIcalString, "43.4913662534171;12.085559129715");
}
function test_icalcomponent() {
......
......@@ -468,7 +468,7 @@ void nsLDAPConnection::InvokeErrorCallback(int32_t opID, nsresult status,
nsPrintfCString location("%s:%d", mDNSHost.get(), mPort);
nsCOMPtr<nsITransportSecurityInfo> tsi = do_QueryInterface(secInfo);
NS_DispatchToMainThread(NS_NewRunnableFunction(
"InvokeErrorCallback", [listener, status, tsi, location]() {
"InvokeErrorCallback", [=]() {
listener->OnLDAPError(status, tsi, location);
}));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment