Merge testing.

--HG--
rename : common/content/base.js => common/modules/base.jsm
rename : common/content/services.js => common/modules/services.jsm
rename : common/content/style.js => common/modules/styles.jsm
rename : common/content/template.js => common/modules/template.jsm
rename : common/content/util.js => common/modules/util.jsm

pentadactyl/Makefile

@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 2.3a1pre
+VERSION       = 1.0pre
 NAME          = pentadactyl
 
 include ../common/Makefile

pentadactyl/TODO

@@ -41,11 +41,10 @@ BUGS:
 - The MOW shouldn't close when executing hints and ;F isn't working.
 
 FEATURES:
+9 Support multiple bookmarks, -keyword, -tags in :delbmarks
 8 Document Textarea, Caret and Visual modes.
 8 Replace config.name tests in dactyl with more specific feature
   tests or overridable APIs where at all feasible.
-8 change the extension ID to pentadactyl@vimperator.org rather than
-  pentadactyl@mozdev.org
 8 finish :help TODOs
 8 fix local options
 8 adaptive timeout for auto-completions, :set completions can be updated more often than

pentadactyl/chrome.manifest

@@ -9,7 +9,7 @@ resource dactyl             ../common/modules/
 skin     dactyl classic/1.0 ../common/skin/
 
 override chrome://dactyl/content/dactyl.dtd  chrome://pentadactyl/content/dactyl.dtd
-override chrome://dactyl/content/config.js      chrome://pentadactyl/content/config.js
+override chrome://dactyl/content/config.js   chrome://pentadactyl/content/config.js
 
 overlay  chrome://browser/content/browser.xul chrome://dactyl/content/dactyl.xul
 overlay  chrome://browser/content/browser.xul chrome://pentadactyl/content/pentadactyl.xul

pentadactyl/content/about.html

@@ -16,11 +16,9 @@
 <div style="text-align: center;">
 <img src="chrome://pentadactyl/content/logo.png" alt="Pentadactyl" />
 version ###VERSION###
-by Martin Stubenschrott et al.
+by Kris Maglione et al.
 Pentadactyl is open source and freely distributable
 
-Sponsor Pentadactyl development!</div><div style="padding-left: 5em;">type :help sponsor&lt;<span class="key">Enter</span>&gt;      for information
-
 type :q&lt;<span class="key">Enter</span>&gt;                 to exit
 type :help&lt;<span class="key">Enter</span>&gt;  or  &lt;<span class="key">F1</span>&gt;    for on-line help
 type :help version-2.1&lt;<span class="key">Enter</span>&gt;  for version info

pentadactyl/content/config.js

@@ -6,10 +6,6 @@
 // given in the LICENSE.txt file included with this file.
 
 const Config = Module("config", ConfigBase, {
-    init: function () {
-    },
-
-    /*** required options, no checks done if they really exist, so be careful ***/
     name: "Pentadactyl",
     hostApplication: "Firefox",
 
@@ -122,12 +118,13 @@ const Config = Module("config", ConfigBase, {
     },
 
     scripts: [
-        "browser.js",
-        "bookmarks.js",
-        "history.js",
-        "quickmarks.js",
-        "sanitizer.js",
-        "tabs.js"
+        "browser",
+        "bookmarkcache",
+        "bookmarks",
+        "history",
+        "quickmarks",
+        "sanitizer",
+        "tabs"
     ],
 
     get tempFile() {
@@ -299,6 +296,7 @@ const Config = Module("config", ConfigBase, {
             "<Up>": modes.NORMAL | modes.INSERT,
             "<Down>": modes.NORMAL | modes.INSERT
         };
+        config.modes.forEach(function (mode) { modes.addMode.apply(this, mode); });
     },
     options: function () {
         options.add(["online"],

pentadactyl/install.rdf

@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
     <Description about="urn:mozilla:install-manifest">
         <em:id>pentadactyl@dactyl.googlecode.com</em:id>
         <em:name>Pentadactyl</em:name>
         <em:version>@VERSION@</em:version>
         <em:description>Make Firefox behave like Vim</em:description>
         <em:creator>Kris Maglione</em:creator>
-        <em:homepageURL>http://pentadactyl.sf.net/</em:homepageURL>
+        <em:homepageURL>http://dactyl.sf.net/</em:homepageURL>
         <em:iconURL>chrome://pentadactyl/skin/icon.png</em:iconURL>
         <em:optionsURL>chrome://dactyl/content/preferences.xul</em:optionsURL>
         <em:file>
@@ -19,7 +19,7 @@
             <Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
                 <em:minVersion>3.5</em:minVersion>
-                <em:maxVersion>4.0</em:maxVersion>
+                <em:maxVersion>4.0b5pre</em:maxVersion>
             </Description>
         </em:targetApplication>
     </Description>