gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-05 04:35:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix storage observer weak ref stuff (Gecko is a strange beast)

Browse Source
This commit is contained in:
Kris Maglione
2008-12-21 18:56:56 -05:00
parent fc0a35e833
commit 3482269980
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/options.js
View File

@@ -96,7 +96,7 @@ Option.prototype = {
},
get values() this.parseValues(this.value),
set values(values) this.setValues(this.scope, values),
set values(values) this.setValues(values, this.scope),
getValues: function (scope) this.parseValues(this.get(scope)),

23
common/modules/storage.jsm
View File

@@ -311,11 +311,22 @@ var storage = {
addObserver: function addObserver(key, callback, ref)
{
if (ref)
{
if (!ref.liberatorStorageRefs)
ref.liberatorStorageRefs = [];
ref.liberatorStorageRefs.push(callback);
var callbackRef = Cu.getWeakReference(callback);
}
else
{
callbackRef = { get: function () callback };
}
this.removeDeadObservers();
if (!(key in observers))
observers[key] = [];
if (observers[key].indexOf(callback) == -1)
observers[key].push({ ref: ref && Cu.getWeakReference(ref), callback: callback });
if (!observers[key].some(function (o) o.callback.get() == callback))
observers[key].push({ ref: ref && Cu.getWeakReference(ref), callback: callbackRef });
},
removeObserver: function (key, callback)
@@ -323,7 +334,7 @@ var storage = {
this.removeDeadObservers();
if (!(key in observers))
return;
observers[key] = observers[key].filter(function (elem) elem.callback != callback);
observers[key] = observers[key].filter(function (elem) elem.callback.get() != callback);
if (observers[key].length == 0)
delete obsevers[key];
},
@@ -332,18 +343,20 @@ var storage = {
{
for (let [key, ary] in Iterator(observers))
{
observers[key] = ary = ary.filter(function (o) !o.ref || o.ref.get());
observers[key] = ary = ary.filter(function (o) o.callback.get() && (!o.ref || o.ref.get() && o.ref.get().liberatorStorageRefs))
if (!ary.length)
delete observers[key];
}
},
get observers() observers,
fireEvent: function fireEvent(key, event, arg)
{
this.removeDeadObservers();
// Safe, since we have our own Array object here.
for each (let observer in observers[key])
observer.callback(key, event, arg);
observer.callback.get()(key, event, arg);
timers[key].tell();
},