Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / teledactyl / content / config.js

diff --git a/teledactyl/content/config.js b/teledactyl/content/config.js
index 67586e81f1ab3783e5874a2e404146bf02b9117f..72215c8610feccc66c60956cbf6a36f822eaf16c 100644 (file)
--- a/teledactyl/content/config.js
+++ b/teledactyl/content/config.js
@@ -4,26 +4,22 @@
 // given in the LICENSE.txt file included with this file.
 "use strict";
 
-const Config = Module("config", ConfigBase, {
-    name: "teledactyl",
-    appName: "Teledactyl",
-    idName: "TELEDACTYL",
-    host: "Thunderbird",
-    hostbin: "thunderbird",
-
+var Config = Module("config", ConfigBase, {
     Local: function Local(dactyl, modules, window)
         let ({ config } = modules, { document } = window) {
         init: function init() {
             init.superapply(this, arguments);
 
-            modules.__defineGetter__("content", function () window.content);
+            if (!("content" in modules))
+                modules.__defineGetter__("content", function () window.content);
 
             util.overlayWindow(window, { append: <><hbox id="statusTextBox" flex=""/></> });
         },
 
-        get browser() window.getBrowser(),
-
-        get commandContainer() document.documentElement.id,
+        get browser()
+            let (tabmail = document.getElementById('tabmail'))
+                tabmail && tabmail.tabInfo.length ? tabmail.getBrowserForSelectedTab()
+                                                  : document.getElementById("messagepane"),
 
         tabbrowser: {
             __proto__: Class.makeClosure.call(window.document.getElementById("tabmail")),
@@ -33,6 +29,8 @@ const Config = Module("config", ConfigBase, {
             get mStrip() this.tabStrip,
             get browsers() [browser for (browser in Iterator(this.mTabs))],
 
+            removeTab: function removeTab(tab) this.closeTab(tab),
+
             loadOneTab: function loadOneTab(uri) {
                 return this.openTab("contentTab", { contentPage: uri });
             },
@@ -41,16 +39,12 @@ const Config = Module("config", ConfigBase, {
             }
         },
 
-        get hasTabbrowser() !this.isComposeWindow,
-
         get tabStip() this.tabbrowser.tabContainer,
 
-        get isComposeWindow() window.wintype == "msgcompose",
-
         get mainWidget() this.isComposeWindow ? document.getElementById("content-frame") : window.GetThreadTree(),
 
-        get mainWindowId() this.isComposeWindow ? "msgcomposeWindow" : "messengerWindow",
         get browserModes() [modules.modes.MESSAGE],
+
         get mailModes() [modules.modes.NORMAL],
 
         // NOTE: as I don't use TB I have no idea how robust this is. --djk
@@ -77,7 +71,7 @@ const Config = Module("config", ConfigBase, {
                 dactyl.beep();
         },
 
-        completers: Class.memoize(function () update({ mailfolder: "mailFolder" }, this.__proto__.completers)),
+        completers: Class.Memoize(function () update({ mailfolder: "mailFolder" }, this.__proto__.completers)),
 
         dialogs: {
             about: ["About Thunderbird",
@@ -109,66 +103,20 @@ const Config = Module("config", ConfigBase, {
         focusChange: function focusChange(win) {
             const { modes } = modules;
 
+            if (win.top == window)
+                return;
+
             // we switch to -- MESSAGE -- mode for Teledactyl when the main HTML widget gets focus
-            if (win && win.document instanceof Ci.nsIHTMLDocument || dactyl.focus instanceof Ci.nsIHTMLAnchorElement) {
+            if (win && win.document instanceof Ci.nsIDOMHTMLDocument
+                    || dactyl.focusedElement instanceof Ci.nsIDOMHTMLAnchorElement) {
+
                 if (this.isComposeWindow)
                     modes.set(modes.INSERT, modes.TEXT_EDIT);
                 else if (dactyl.mode != modes.MESSAGE)
                     modes.main = modes.MESSAGE;
             }
         }
-    },
-
-    autocommands: {
-        DOMLoad: "Triggered when a page's DOM content has fully loaded",
-        FolderLoad: "Triggered after switching folders in Thunderbird",
-        PageLoadPre: "Triggered after a page load is initiated",
-        PageLoad: "Triggered when a page gets (re)loaded/opened",
-        Enter: "Triggered after Thunderbird starts",
-        Leave: "Triggered before exiting Thunderbird",
-        LeavePre: "Triggered before exiting Thunderbird"
-    },
-
-    defaults: {
-        guioptions: "bCfrs",
-        complete: "f",
-        showtabline: 1,
-        titlestring: "Teledactyl"
-    },
-
-    /*** optional options, there are checked for existence and a fallback provided  ***/
-    features: Class.memoize(function () set(
-        this.isComposeWindow ? ["addressbook"]
-                             : ["hints", "mail", "marks", "addressbook", "tabs"])),
-
-    guioptions: {
-        m: ["MenuBar",            ["mail-toolbar-menubar2"]],
-        T: ["Toolbar" ,           ["mail-bar2"]],
-        f: ["Folder list",        ["folderPaneBox", "folderpane_splitter"]],
-        F: ["Folder list header", ["folderPaneHeader"]]
-    },
-
-    // they are sorted by relevance, not alphabetically
-    helpFiles: ["intro.html", "version.html"],
-
-    modes: [
-        ["MESSAGE", { char: "m" }],
-        ["COMPOSE"]
-    ],
-
-    get scripts() this.isComposeWindow ? ["compose/compose"] : [
-        "addressbook",
-        "mail",
-        "tabs",
-    ],
-
-    overlayChrome: ["chrome://messenger/content/messenger.xul",
-                      "chrome://messenger/content/messengercompose/messengercompose.xul"],
-    styleableChrome: ["chrome://messenger/content/messenger.xul",
-                      "chrome://messenger/content/messengercompose/messengercompose.xul"],
-
-    // to allow Vim to :set ft=mail automatically
-    tempFile: "teledactyl.eml"
+    }
 }, {
 }, {
     commands: function initCommands(dactyl, modules, window) {
@@ -214,4 +162,4 @@ const Config = Module("config", ConfigBase, {
     }
 });
 
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et: