gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 16:52:25 +01:00
Code Issues Projects Releases Wiki Activity

Move events.prefObserver to options.prefObserver.

Browse Source
This commit is contained in:
Doug Kearns
2009-05-15 22:17:00 +10:00
parent 47f63446cb
commit a97d419fc8
2 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/content/events.js
View File

@@ -1733,38 +1733,6 @@ function Events() //{{{
// Stub for something else, presumably. Not in any documented
// interface.
onLinkIconAvailable: function () {}
},
// TODO: move to options.js?
prefObserver: {
register: function ()
{
// better way to monitor all changes?
this._branch = services.get("pref").getBranch("").QueryInterface(Ci.nsIPrefBranch2);
this._branch.addObserver("", this, false);
},
unregister: function ()
{
if (this._branch)
this._branch.removeObserver("", this);
},
observe: function (subject, topic, data)
{
if (topic != "nsPref:changed")
return;
// subject is the nsIPrefBranch we're observing (after appropriate QI)
// data is the name of the pref that's been changed (relative to subject)
switch (data)
{
case "accessibility.browsewithcaret":
let value = options.getPref("accessibility.browsewithcaret", false);
liberator.mode = value ? modes.CARET : modes.NORMAL;
break;
}
}
}
}; //}}}
@@ -1782,10 +1750,8 @@ function Events() //{{{
}
catch (e) {}
self.prefObserver.register();
liberator.registerObserver("shutdown", function () {
self.destroy();
self.prefObserver.unregister();
});
window.addEventListener("keypress", wrapListener("onKeyPress"), true);

44
common/content/options.js
View File

@@ -805,7 +805,7 @@ function Options() //{{{
.map(function (pref) [pref, ""])]);
});
return {
const self = {
OPTION_SCOPE_GLOBAL: 1,
OPTION_SCOPE_LOCAL: 2,
@@ -817,6 +817,37 @@ function Options() //{{{
return (v for ([k, v] in Iterator(sorted)));
},
prefObserver: {
register: function ()
{
// better way to monitor all changes?
this._branch = services.get("pref").getBranch("").QueryInterface(Ci.nsIPrefBranch2);
this._branch.addObserver("", this, false);
},
unregister: function ()
{
if (this._branch)
this._branch.removeObserver("", this);
},
observe: function (subject, topic, data)
{
if (topic != "nsPref:changed")
return;
// subject is the nsIPrefBranch we're observing (after appropriate QI)
// data is the name of the pref that's been changed (relative to subject)
switch (data)
{
case "accessibility.browsewithcaret":
let value = options.getPref("accessibility.browsewithcaret", false);
liberator.mode = value ? modes.CARET : modes.NORMAL;
break;
}
}
},
add: function (names, description, type, defaultValue, extraInfo)
{
if (!extraInfo)
@@ -1064,8 +1095,15 @@ function Options() //{{{
this.popContext();
}
}
};
//}}}
}; //}}}
self.prefObserver.register();
liberator.registerObserver("shutdown", function () {
self.prefObserver.unregister();
});
return self;
}; //}}}
// vim: set fdm=marker sw=4 ts=4 et: