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

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

diff --git a/pentadactyl/content/config.js b/pentadactyl/content/config.js
index 8c10f837e3f352f252d88136b3bf5c2d7648700d..183f6d103999f489740ed12869f14a1d53f3e66c 100644 (file)
--- a/pentadactyl/content/config.js
+++ b/pentadactyl/content/config.js
@@ -79,16 +79,6 @@ var Config = Module("config", ConfigBase, {
                 else
                     dactyl.beep();
             }
-        },
-
-        get tempFile() {
-            let prefix = this.name;
-            try {
-                prefix += "-" + window.content.document.location.hostname;
-            }
-            catch (e) {}
-
-            return prefix + ".txt";
         }
     })
 
@@ -221,7 +211,8 @@ var Config = Module("config", ConfigBase, {
         completion.sidebar = function sidebar(context) {
             let menu = document.getElementById("viewSidebarMenu");
             context.title = ["Sidebar Panel"];
-            context.completions = Array.map(menu.childNodes, function (n) [n.getAttribute("label"), ""]);
+            context.completions = Array.filter(menu.childNodes, function (n) n.hasAttribute("label"))
+                                       .map(function (n) [n.getAttribute("label"), ""]);
         };
     },
     events: function initEvents(dactyl, modules, window) {
@@ -252,4 +243,4 @@ var Config = Module("config", ConfigBase, {
     }
 });
 
-// vim: set fdm=marker sw=4 ts=4 et:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et: