diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2010-12-29 15:24:32 -0500 |
|---|---|---|
| committer | Kris Maglione <maglione.k@gmail.com> | 2010-12-29 15:24:32 -0500 |
| commit | c166ab715ce4d9640c68172d0d45bf46b4a26fe6 (patch) | |
| tree | 49eaf1c3ca9e964077c4f5ab9e2c041692e334ba | |
| parent | 1504f4093f70b500f1e5f2ac2891fbd654372d92 (diff) | |
| download | pentadactyl-c166ab715ce4d9640c68172d0d45bf46b4a26fe6.tar.gz | |
Cleanup sidebar menu generation.
| -rw-r--r-- | common/modules/config.jsm | 18 | ||||
| -rw-r--r-- | pentadactyl/content/config.js | 52 |
2 files changed, 25 insertions, 45 deletions
diff --git a/common/modules/config.jsm b/common/modules/config.jsm index f2a632ca..c3cce1e8 100644 --- a/common/modules/config.jsm +++ b/common/modules/config.jsm @@ -51,6 +51,24 @@ var ConfigBase = Class("ConfigBase", { Local: function Local(dactyl, modules, window) let ({modes} = modules) ({ + init: function init() { + + let append = <e4x xmlns={XUL} xmlns:dactyl={NS}> + <menupopup id="viewSidebarMenu"/> + <broadcasterset id="mainBroadcasterSet"/> + </e4x>; + for each (let [id, [name, key, uri]] in Iterator(this.sidebars)) { + append.XUL::menupopup[0].* += + <menuitem observes={"pentadactyl-" + id + "Sidebar"} label={name} accesskey={key} xmlns={XUL}/> + append.XUL::broadcasterset[0].* += + <broadcaster id={"pentadactyl-" + id + "Sidebar"} + autoCheck="false" type="checkbox" group="sidebar" + sidebartitle={name} sidebarurl={uri} + oncommand="toggleSidebar(this.id);" xmlns={XUL}/> + } + + util.overlayWindow(window, { append: append.elements() }); + }, get browser() window.gBrowser, get tabbrowser() window.gBrowser, diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js index f8ca97fa..29c94b07 100644 --- a/pentadactyl/content/config.js +++ b/pentadactyl/content/config.js @@ -16,51 +16,6 @@ var Config = Module("config", ConfigBase, { Local: function Local(dactyl, modules, window) let ({ config } = modules) ({ - init: function init() { - init.superapply(this, arguments); - - util.overlayWindow(window, { - append: <e4x xmlns={XUL} xmlns:dactyl={NS}> - <menupopup id="viewSidebarMenu"> - <menuitem observes="pentadactyl-viewAddonsSidebar" label="Add-ons" accesskey="A"/> - <menuitem observes="pentadactyl-viewConsoleSidebar" label="Console" accesskey="C"/> - <menuitem observes="pentadactyl-viewDownloadsSidebar" label="Downloads" accesskey="D"/> - <menuitem observes="pentadactyl-viewPreferencesSidebar" label="Preferences" accesskey="P"/> - </menupopup> - - <broadcasterset id="mainBroadcasterSet"> - <broadcaster id="pentadactyl-viewAddonsSidebar" - autoCheck="false" - type="checkbox" - group="sidebar" - sidebarurl="chrome://mozapps/content/extensions/extensions.xul" - sidebartitle="Add-ons" - oncommand="toggleSidebar(this.id);"/> - <broadcaster id="pentadactyl-viewConsoleSidebar" - autoCheck="false" - type="checkbox" - group="sidebar" - sidebarurl="chrome://global/content/console.xul" - sidebartitle="Console" - oncommand="toggleSidebar(this.id);"/> - <broadcaster id="pentadactyl-viewDownloadsSidebar" - autoCheck="false" - type="checkbox" - group="sidebar" - sidebarurl="chrome://mozapps/content/downloads/downloads.xul" - sidebartitle="Downloads" - oncommand="toggleSidebar(this.id);"/> - <broadcaster id="pentadactyl-viewPreferencesSidebar" - autoCheck="false" - type="checkbox" - group="sidebar" - sidebarurl="about:config" - sidebartitle="Preferences" - oncommand="toggleSidebar(this.id);"/> - </broadcasterset> - </e4x>.elements() - }); - }, dialogs: { about: ["About Firefox", @@ -200,6 +155,13 @@ var Config = Module("config", ConfigBase, { "sanitizer", "tabs" ], + + sidebars: { + viewAddons: ["Add-ons", "A", "chrome://mozapps/content/extensions/extensions.xul"], + viewConsole: ["Console", "C", "chrome://global/content/console.xul"], + viewDownloads: ["Downloads", "D", "chrome://mozapps/content/downloads/downloads.xul"], + viewPreferences: ["Preferences", "P", "about:config"] + } }, { }, { commands: function (dactyl, modules, window) { |