1346808 - Make calUtils.js functions independent of window

Status: RESOLVED FIXED

(Calendar :: General, enhancement, P1)

Description

[Philipp Kewisch [:Fallen][📱📆]]

Some of the calUtils.js functions are meant to run in a scope that has a window. Moving to calUtils.jsm we should stop doing this.

Comment 1

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: Fix - v1

Comment 2

[[:MakeMyDay]]

Comment on attachment 8846663 [details] [diff] [review]
Fix - v1

Review of attachment 8846663 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks. r+ with the missing prefixes added.

::: calendar/base/content/dialogs/calendar-migration-dialog.js
@@ +559,3 @@
>                      break;
>                  default:
> +                    cal.showError(calGetString("calendar", "unableToRead") + icsFile.path + "\n"+ ex, window);

Please use cal.calGetString() instead (here an at some other places in this patch).

Comment 3

[Philipp Kewisch [:Fallen][📱📆]]

I have the cal.calGetString changes lined up in a different patch in my queue, I'd prefer to fix only the issue in the bug :) Will land this when I have my queue cleaned up.

Comment 4

[Martin Schröder [:mschroeder]]

Attachment: Fix v2

After talking to Philipp I updated the patch, editing an additional usage of showError() in calendar-alarm-dialog.js. Carrying over r+.

Comment 5

[Philipp Kewisch [:Fallen][📱📆]]

Thanks for updating the patch! The next one in my queue is bug 1347149.

Comment 6

[Jorg K (CEST = GMT+2)]

https://hg.mozilla.org/comm-central/rev/a4458b9e5377a6cb415bedee8fddf7e677a2b7ce

Comment 7

[Frank-Rainer Grahl (:frg)]

I am getting:

> Timestamp: 5/29/2017, 1:44:05 PM
> Error: ReferenceError: gCalendarStatusFeedback is not defined
> Source File: resource://calendar/modules/calUtils.jsm -> file:///C:/Program%20Files/SeaMonkey
> /extensions/%7Be2fda1a4-762b-4020-b5ad-a41df1933103%7D/calendar-js/calUtils.js
> Line: 1871

Shouldn't 
 comp.setStatusObserver(gCalendarStatusFeedback, chromeWindow);
be 
 comp.setStatusObserver(aWindow.gCalendarStatusFeedback, chromeWindow);

Comment 8

[Martin Schröder [:mschroeder]]

Attachment: Follow-up fix

Comment 9

[Jorg K (CEST = GMT+2)]

Comment on attachment 8872355 [details] [diff] [review]
Follow-up fix

That looks right.

Comment 10

[Jorg K (CEST = GMT+2)]

https://hg.mozilla.org/comm-central/rev/62db49c50e60514a4178651227629a9625381cb4