Skip to content

Replace cal.createAdapter-based calendar observers with explicit calIObserver objects #67

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
kewisch merged 3 commits into from
Apr 20, 2026
+29 −4
Merged

Replace cal.createAdapter-based calendar observers with explicit calIObserver objects #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc734db
Fix calendar observers on Thunderbird 149 by replacing cal.createAdapter
DeBaschdi Apr 9, 2026
d7acd7d
Adjust JSDoc types
DeBaschdi Apr 16, 2026
aaf5adb
refactor(calendar): deduplicate createCalendarObserver into shared utils
DeBaschdi Apr 20, 2026
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
23 changes: 23 additions & 0 deletions calendar/experiments/calendar/ext-calendar-utils.sys.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,29 @@ export function convertAlarm(item, alarm) {
};
}

/**
* Thunderbird >=148 no longer exposes cal.createAdapter(). Build explicit
* calIObserver objects so the calendar experiment keeps working on newer
* release channels as well as ESR.
*
* @param {object} methods
* @returns {calIObserver}
*/
export function createCalendarObserver(methods = {}) {
return Object.assign({
QueryInterface: ChromeUtils.generateQI(["calIObserver"]),
onStartBatch() {},
onEndBatch() {},
onLoad() {},
onAddItem() {},
onModifyItem() {},
onDeleteItem() {},
onError() {},
onPropertyChanged() {},
onPropertyDeleting() {},
}, methods);
}

export async function setupE10sBrowser(extension, browser, parent, initOptions={}) {
browser.setAttribute("type", "content");
browser.setAttribute("disableglobalhistory", "true");
Expand Down
3 changes: 2 additions & 1 deletion calendar/experiments/calendar/parent/ext-calendar-calendars.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ this.calendar_calendars = class extends ExtensionAPI {
const root = `experiments-calendar-${uuid}`;
const query = context.extension.manifest.version;
const {
createCalendarObserver,
unwrapCalendar,
getResolvedCalendarById,
isOwnCalendar,
Expand Down Expand Up @@ -275,7 +276,7 @@ this.calendar_calendars = class extends ExtensionAPI {
context,
name: "calendar.calendars.onUpdated",
register: fire => {
const observer = cal.createAdapter(Ci.calIObserver, {
const observer = createCalendarObserver({
onPropertyChanged(calendar, name, value, _oldValue) {
const converted = convertCalendar(context.extension, calendar);
switch (name) {
Expand Down
7 changes: 4 additions & 3 deletions calendar/experiments/calendar/parent/ext-calendar-items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ this.calendar_items = class extends ExtensionAPI {
const root = `experiments-calendar-${uuid}`;
const query = context.extension.manifest.version;
const {
createCalendarObserver,
getResolvedCalendarById,
getCachedCalendar,
isCachedCalendar,
Expand Down Expand Up @@ -164,7 +165,7 @@ this.calendar_items = class extends ExtensionAPI {
context,
name: "calendar.items.onCreated",
register: (fire, options) => {
const observer = cal.createAdapter(Ci.calIObserver, {
const observer = createCalendarObserver({
onAddItem: item => {
fire.sync(convertItem(item, options, context.extension));
},
Expand All @@ -181,7 +182,7 @@ this.calendar_items = class extends ExtensionAPI {
context,
name: "calendar.items.onUpdated",
register: (fire, options) => {
const observer = cal.createAdapter(Ci.calIObserver, {
const observer = createCalendarObserver({
onModifyItem: (newItem, _oldItem) => {
// TODO calculate changeInfo
const changeInfo = {};
Expand All @@ -200,7 +201,7 @@ this.calendar_items = class extends ExtensionAPI {
context,
name: "calendar.items.onRemoved",
register: fire => {
const observer = cal.createAdapter(Ci.calIObserver, {
const observer = createCalendarObserver({
onDeleteItem: item => {
fire.sync(item.calendar.id, item.id);
},
Expand Down
Loading