diff --git a/common/modules/options.jsm b/common/modules/options.jsm index 904787c0..3164862c 100644 --- a/common/modules/options.jsm +++ b/common/modules/options.jsm @@ -1587,18 +1587,6 @@ var Options = Module("options", { dactyl.reportError(e); } }, - privateEnter: function privateEnter() { - for (let opt of values(modules.options._options)) - if (opt.privateData && (!callable(opt.privateData) || opt.privateData(opt.value))) - opt.oldValue = opt.value; - }, - privateLeave: function privateLeave() { - for (let opt of values(modules.options._options)) - if (opt.oldValue != null) { - opt.value = opt.oldValue; - opt.oldValue = null; - } - } }); } }); diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index cdcf9177..b9279392 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -1,5 +1,5 @@ // Copyright (c) 2009 by Doug Kearns -// Copyright (c) 2009-2014 Kris Maglione +// Copyright (c) 2009-2015 Kris Maglione // // This work is licensed for reuse under an MIT license. Details are // given in the LICENSE.txt file included with this file. @@ -273,15 +273,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef apply(params, "action", arg); }, getWindow(params.action)); - - if (params.privateEnter || params.privateLeave) - storage.addObserver("private-mode", - function (key, event, arg) { - let meth = params[arg ? "privateEnter" : "privateLeave"]; - if (meth) - meth.call(params); - }, - getWindow(params.privateEnter || params.privateLeave)); }, observers: { @@ -302,13 +293,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef if (this.runAtShutdown && !this.sanitizeItems(null, Range(), null, "shutdown")) this.ranAtShutdown = true; }, - "private-browsing": function (subject, data) { - if (data == "enter") - storage.privateMode = true; - else if (data == "exit") - storage.privateMode = false; - storage.fireEvent("private-mode", "change", storage.privateMode); - } }, /** @@ -430,10 +414,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef autocommands: function initAutocommands(dactyl, modules, window) { const { autocommands } = modules; - storage.addObserver("private-mode", - function (key, event, value) { - autocommands.trigger("PrivateMode", { state: value }); - }, window); storage.addObserver("sanitizer", function (key, event, value) { if (event == "domain") @@ -447,8 +427,6 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef commands.add(["sa[nitize]"], "Clear private data", function (args) { - dactyl.assert(!modules.options['private'], _("command.sanitize.privateMode")); - if (args["-host"] && !args.length && !args.bang) args[0] = "all"; diff --git a/common/modules/services.jsm b/common/modules/services.jsm index 5de5d3c2..458a3e33 100644 --- a/common/modules/services.jsm +++ b/common/modules/services.jsm @@ -62,7 +62,6 @@ var Services = Module("Services", { this.add("observer", "@mozilla.org/observer-service;1", "nsIObserverService"); this.add("pref", "@mozilla.org/preferences-service;1", ["nsIPrefBranch2", "nsIPrefService"]); this.add("printSettings", "@mozilla.org/gfx/printsettings-service;1", "nsIPrintSettingsService"); - this.add("privateBrowsing", "@mozilla.org/privatebrowsing;1", "nsIPrivateBrowsingService"); this.add("profile", "@mozilla.org/toolkit/profile-service;1", "nsIToolkitProfileService"); this.add("resource:", this.PROTOCOL + "resource", ["nsIProtocolHandler", "nsIResProtocolHandler"]); this.add("runtime", "@mozilla.org/xre/runtime;1", ["nsIXULAppInfo", "nsIXULRuntime"]); diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm index 19ef0b54..52f40f97 100644 --- a/common/modules/storage.jsm +++ b/common/modules/storage.jsm @@ -68,7 +68,7 @@ var StoreBase = Class("StoreBase", { storage.infoPath.child(this.name).path); }, - save: function () { (self.storage || storage)._saveData(this); }, + save: function () { (this.storage || storage)._saveData(this); }, "@@iterator": function () iter(this._object) }); @@ -230,8 +230,9 @@ var Storage = Module("Storage", { }, _saveData: promises.task(function* saveData(obj) { - if (obj.privateData && storage.privateMode) + if (obj.privateData && this.privateMode) return; + if (obj.store && storage.infoPath) { var { path } = storage.infoPath.child(obj.name); yield OS.File.makeDir(storage.infoPath.path, diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS index 8179bd36..f6f075cc 100644 --- a/pentadactyl/NEWS +++ b/pentadactyl/NEWS @@ -1,5 +1,6 @@ 1.2pre: • Remove 'jsdebugger' option. + • Remove defunct 'PrivateMode' autocommand. 1.1: • Vim runtime files: @@ -9,6 +10,7 @@ • Removed and mappings. • Add :private command. • Better per-window private browsing support. + • Removed 'private' option. 1.0: • Extensive Firefox 4 support, including: diff --git a/pentadactyl/config.json b/pentadactyl/config.json index dc1e8ec6..63ceedb2 100644 --- a/pentadactyl/config.json +++ b/pentadactyl/config.json @@ -43,7 +43,6 @@ "LocationChange": "Triggered when changing tabs or when navigation to a new location", "PageLoadPre": "Triggered after a page load is initiated", "PageLoad": "Triggered when a page gets (re)loaded/opened", - "PrivateMode": "Triggered when private browsing mode is activated or deactivated", "Sanitize": "Triggered when a sanitizeable item is cleared", "ShellCmdPost": "Triggered after executing a shell command with :!cmd", "Enter": "Triggered after Firefox starts", diff --git a/pentadactyl/locale/en-US/autocommands.xml b/pentadactyl/locale/en-US/autocommands.xml index d2aa0ce4..065a3647 100644 --- a/pentadactyl/locale/en-US/autocommands.xml +++ b/pentadactyl/locale/en-US/autocommands.xml @@ -18,7 +18,6 @@
LocationChange
Triggered when changing tabs or when navigating to a new location
PageLoadPre
Triggered after a page load is initiated
PageLoad
Triggered when a page gets (re)loaded/opened
-
PrivateMode
Triggered when private browsing mode is activated or deactivated
Sanitize
Triggered when private data are sanitized
ShellCmdPost
Triggered after executing a shell command with :!cmd
Enter
Triggered after &dactyl.host; starts
@@ -35,7 +34,7 @@
<keyword>
The keywords applied to the bookmark. Only for BookmarkChange, BookmarkRemove.
<name>
The name of the item. Only for ColorScheme and Sanitize.
<size>
The size of a downloaded file. Only for DownloadPost.
-
<state>
The new state. Only for Fullscreen and PrivateMode.
+
<state>
The new state. Only for Fullscreen.
<tab>
The tab in which the event occurred. Only for DOMLoad, PageLoad and PageLoadPre.
<tags>
The tags applied to <url>. Only for Bookmark*.
<title>
The page, bookmark or download title.