1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-10 15:24:11 +01:00

Merge default.

--HG--
branch : mode-refactoring
This commit is contained in:
Kris Maglione
2010-10-10 02:56:22 -04:00
9 changed files with 139 additions and 59 deletions

View File

@@ -816,7 +816,7 @@ Class.prototype = {
*/
timeout: function (callback, timeout) {
const self = this;
let notify = { notify: function notify(timer) { callback.call(self) } };
let notify = { notify: function notify(timer) { try { callback.apply(self) } catch (e) { util.reportError(e) } } };
let timer = services.create("timer");
timer.initWithCallback(notify, timeout || 0, timer.TYPE_ONE_SHOT);
return timer;

View File

@@ -292,8 +292,12 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
"Set the 'private browsing' option",
"boolean", false,
{
setter: function (value) services.get("privateBrowsing").privateBrowsingEnabled = value,
getter: function () services.get("privateBrowsing").privateBrowsingEnabled
initialValue: true,
getter: function () services.get("privateBrowsing").privateBrowsingEnabled,
setter: function (value) {
if (services.get("privateBrowsing").privateBrowsingEnabled != value)
services.get("privateBrowsing").privateBrowsingEnabled = value
}
});
options.add(["sanitizeitems", "si"],