First work towards cleaning up the commandline.js rat's nest. Don't expect any of these new interfaces to stay remotely as they are.

--HG--
branch : key-processing

1 files changed, 6 insertions, 0 deletions

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 95b7c6f6..bb5aa362 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -40,11 +40,15 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
         this.commands["dactyl.restart"] = function (event) {
             dactyl.restart();
         };
+
+        styles.registerSheet("resource://dactyl-skin/dactyl.css");
     },
 
     cleanup: function () {
         delete window.dactyl;
         delete window.liberator;
+
+        styles.unregisterSheet("resource://dactyl-skin/dactyl.css");
     },
 
     destroy: function () {
@@ -1285,6 +1289,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
      */
     trapErrors: function trapErrors(func, self) {
         try {
+            if (isString(func))
+                func = self[func];
             return func.apply(self || this, Array.slice(arguments, 2));
         }
         catch (e) {