summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKris Maglione <maglione.k@gmail.com>2011-08-04 13:03:40 -0400
committerKris Maglione <maglione.k@gmail.com>2011-08-04 13:03:40 -0400
commit55f5f9292b18a7b6ff2f6d70cb45a530b81e3862 (patch)
tree1c8f66fd7deb88b06c415a3d6adf2d3d3330c986
parentc01a9a72b0d6473ee0dddaefec44e610b9db8c03 (diff)
downloadpentadactyl-55f5f9292b18a7b6ff2f6d70cb45a530b81e3862.tar.gz
Fix some :buffer completion issues.
-rw-r--r--common/content/buffer.js2
-rw-r--r--common/content/tabs.js2
-rw-r--r--common/modules/template.jsm2
3 files changed, 3 insertions, 3 deletions
diff --git a/common/content/buffer.js b/common/content/buffer.js
index d0c732cd..d1577935 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1627,7 +1627,7 @@ var Buffer = Module("buffer", {
return {
text: [i + ": " + (tab.label || /*L*/"(Untitled)"), i + ": " + url],
tab: tab,
- id: i - 1,
+ id: i,
url: url,
icon: tab.image || DEFAULT_FAVICON
};
diff --git a/common/content/tabs.js b/common/content/tabs.js
index c6210807..2aeae8b7 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -32,7 +32,7 @@ var Tabs = Module("tabs", {
false, true);
dactyl.commands["tabs.select"] = function (event) {
- tabs.select(event.originalTarget.getAttribute("identifier"));
+ tabs.switchTo(event.originalTarget.getAttribute("identifier"));
};
this.tabBinding = styles.system.add("tab-binding", "chrome://browser/content/browser.xul", String.replace(<><![CDATA[
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 6e18dc50..9cd617c6 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -171,7 +171,7 @@ var Template = Module("Template", {
<>&#xa0;</>)
})&#xa0;</span>
}
- <a xmlns:dactyl={NS} identifier={item.id || ""} dactyl:command={item.command || ""}
+ <a xmlns:dactyl={NS} identifier={item.id == null ? "" : item.id} dactyl:command={item.command || ""}
href={item.item.url} highlight="URL">{text || ""}</a>
</>,