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

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

diff --git a/melodactyl/content/config.js b/melodactyl/content/config.js
index 02702037706bcfbe0f35429d5aaf192652a31006..20a12983e84cff4d0d743bbb6e896e2906573e00 100644 (file)
--- a/melodactyl/content/config.js
+++ b/melodactyl/content/config.js
@@ -133,7 +133,7 @@ const Config = Module("config", ConfigBase, {
     },
 
     /*** optional options, there are checked for existence and a fallback provided  ***/
-    features: set(["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "player"]),
+    features: Set(["bookmarks", "hints", "marks", "history", "quickmarks", "session", "tabs", "player"]),
 
     defaults: {
         guioptions: "bCmprs",
@@ -182,8 +182,6 @@ const Config = Module("config", ConfigBase, {
         song: "song"
     }, this.__proto__.completers)),
 
-    hasTabbrowser: true,
-
     removeTab: function (tab) {
         if (config.tabbrowser.mTabs.length > 1)
             config.tabbrowser.removeTab(tab);
@@ -326,4 +324,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: