diff options
Diffstat (limited to 'vimperator')
| -rw-r--r-- | vimperator/chrome.manifest | 2 | ||||
| -rw-r--r-- | vimperator/components/about-handler.js | 2 | ||||
| -rw-r--r-- | vimperator/components/commandline-handler.js | 2 | ||||
| -rw-r--r-- | vimperator/content/config.js | 34 | ||||
| -rw-r--r-- | vimperator/install.rdf | 2 |
5 files changed, 6 insertions, 36 deletions
diff --git a/vimperator/chrome.manifest b/vimperator/chrome.manifest index 1066edbe..57ebfae3 100644 --- a/vimperator/chrome.manifest +++ b/vimperator/chrome.manifest @@ -8,7 +8,7 @@ content liberator ../common/content/ resource liberator ../common/modules/ skin liberator classic/1.0 ../common/skin/ -override chrome://liberator/content/liberator.dtd chrome://vimperator/content/liberator.dtd +override chrome://liberator/content/liberator.dtd chrome://vimperator/content/liberator.dtd override chrome://liberator/content/config.js chrome://vimperator/content/config.js overlay chrome://browser/content/browser.xul chrome://liberator/content/liberator.xul diff --git a/vimperator/components/about-handler.js b/vimperator/components/about-handler.js index 3d2692fc..ee3bb5ec 100644 --- a/vimperator/components/about-handler.js +++ b/vimperator/components/about-handler.js @@ -1,6 +1,6 @@ // Header: const Name = "Vimperator"; -// The following doesn't work here, so this module's code is sadly suplicated: +// The following doesn't work here, so this module's code is sadly duplicated: // Components.utils.import("resource://liberator/about-handler.jsm"); // Copyright (c) 2009 by Doug Kearns diff --git a/vimperator/components/commandline-handler.js b/vimperator/components/commandline-handler.js index 4fd3bb75..88309e2c 100644 --- a/vimperator/components/commandline-handler.js +++ b/vimperator/components/commandline-handler.js @@ -1,6 +1,6 @@ // Header: const Name = "Vimperator"; -// The following doesn't work here, so this module's code is sadly suplicated: +// The following doesn't work here, so this module's code is sadly duplicated: // Components.utils.import("resource://liberator/commandline-handler.jsm"); // Copyright (c) 2009 by Doug Kearns diff --git a/vimperator/content/config.js b/vimperator/content/config.js index c9c6e9d9..4c799850 100644 --- a/vimperator/content/config.js +++ b/vimperator/content/config.js @@ -110,6 +110,8 @@ const config = { //{{{ scripts: [ "browser.js", "bookmarks.js", + "history.js", + "quickmarks.js", "sanitizer.js", "tabs.js" ], @@ -128,38 +130,6 @@ const config = { //{{{ init: function () { - // load Vimperator specific modules - // FIXME: Why aren't these listed in config.scripts? - // FIXME: Why isn't this automatic? -> how would one know which classes to load where? --mst - // Something like: - // liberator.addModule("search", function Search() { ... - // for all modules, or something similar. For modules which - // require other modules, well, there's addObserver("load_foo", - // or we could just make sure that they're all sourced in order. - // The scripts could even just instantiate them themselves. - // --Kris - liberator.loadModule("browser", Browser); - liberator.loadModule("finder", Finder); - liberator.loadModule("bookmarks", Bookmarks); - liberator.loadModule("history", History); - liberator.loadModule("tabs", Tabs); - liberator.loadModule("marks", Marks); - liberator.loadModule("quickmarks", QuickMarks); - liberator.loadModule("hints", Hints); - liberator.loadModule("sanitizer", Sanitizer); - - //////////////////////////////////////////////////////////////////////////////// - ////////////////////// STYLES ////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////{{{ - - /////////////////////////////////////////////////////////////////////////////}}} - ////////////////////// MAPPINGS //////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////{{{ - - /////////////////////////////////////////////////////////////////////////////}}} - ////////////////////// COMMANDS //////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////////{{{ - commands.add(["winon[ly]"], "Close all other windows", function () diff --git a/vimperator/install.rdf b/vimperator/install.rdf index 0a29dad7..454dc2e7 100644 --- a/vimperator/install.rdf +++ b/vimperator/install.rdf @@ -12,7 +12,7 @@ <em:optionsURL>chrome://liberator/content/preferences.xul</em:optionsURL> <em:file> <Description about="urn:mozilla:extension:file:vimperator.jar"> - <em:package>content/vimperator/</em:package> + <em:package>content/liberator/</em:package> </Description> </em:file> <em:targetApplication> |