Import 1.0b7.1 supporting Firefox up to 8.*

[dactyl.git] / common / content / history.js

diff --git a/common/content/history.js b/common/content/history.js
index cf985d99ade2d605ae481627e00a68909539ed5b..a4bb2838a2102317a65682a4a562f8df7404f146 100644 (file)
--- a/common/content/history.js
+++ b/common/content/history.js
@@ -41,7 +41,7 @@ var History = Module("history", {
             return {
                 url: node.uri,
                 title: node.title,
-                icon: node.icon ? node.icon.spec : DEFAULT_FAVICON
+                icon: node.icon ? node.icon : DEFAULT_FAVICON
             };
         }).toArray();
         root.containerOpen = false; // close a container after using it!
@@ -230,8 +230,8 @@ var History = Module("history", {
                                 "uri",
                                 "visitcount"
                             ].map(function (order) [
-                                  ["+" + order.replace(" ", ""), "Sort by " + order + " ascending"],
-                                  ["-" + order.replace(" ", ""), "Sort by " + order + " descending"]
+                                  ["+" + order.replace(" ", ""), /*L*/"Sort by " + order + " ascending"],
+                                  ["-" + order.replace(" ", ""), /*L*/"Sort by " + order + " descending"]
                             ]));
                         }
                     }