mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 690414 - syncNotification.xml leaks 'Observers' and 'Notifications' into the global scope. r=gavin
This commit is contained in:
parent
be7c553c03
commit
f727ec666d
@ -56,19 +56,20 @@
|
||||
|
||||
<implementation>
|
||||
<constructor><![CDATA[
|
||||
Cu.import("resource://services-sync/ext/Observers.js");
|
||||
Cu.import("resource://services-sync/notifications.js");
|
||||
let temp = {};
|
||||
Cu.import("resource://services-sync/ext/Observers.js", temp);
|
||||
temp.Observers.add("weave:notification:added", this.onNotificationAdded, this);
|
||||
temp.Observers.add("weave:notification:removed", this.onNotificationRemoved, this);
|
||||
|
||||
Observers.add("weave:notification:added", this.onNotificationAdded, this);
|
||||
Observers.add("weave:notification:removed", this.onNotificationRemoved, this);
|
||||
|
||||
for each (var notification in Notifications.notifications)
|
||||
for each (var notification in Weave.Notifications.notifications)
|
||||
this._appendNotification(notification);
|
||||
]]></constructor>
|
||||
|
||||
<destructor><![CDATA[
|
||||
Observers.remove("weave:notification:added", this.onNotificationAdded, this);
|
||||
Observers.remove("weave:notification:removed", this.onNotificationRemoved, this);
|
||||
let temp = {};
|
||||
Cu.import("resource://services-sync/ext/Observers.js", temp);
|
||||
temp.Observers.remove("weave:notification:added", this.onNotificationAdded, this);
|
||||
temp.Observers.remove("weave:notification:removed", this.onNotificationRemoved, this);
|
||||
]]></destructor>
|
||||
|
||||
<method name="onNotificationAdded">
|
||||
@ -140,7 +141,7 @@
|
||||
onset="this._notification = val; return val;"/>
|
||||
<method name="close">
|
||||
<body><![CDATA[
|
||||
Notifications.remove(this.notification);
|
||||
Weave.Notifications.remove(this.notification);
|
||||
|
||||
// We should be able to call the base class's close method here
|
||||
// to remove the notification element from the notification box,
|
||||
|
Loading…
Reference in New Issue
Block a user