gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 05:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix links in :ls and remove some old cruft as a result.

Browse Source
This commit is contained in:
Kris Maglione
2010-09-27 17:28:45 -04:00
parent e238c1d361
commit 53b83e378a
8 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/buffer.js
View File

@@ -1328,7 +1328,7 @@ const Buffer = Module("buffer", {
context.process[1] = function (item, text) template.bookmarkDescription(item, template.highlightFilter(text, this.filter));
context.anchored = false;
context.keys = { text: "text", description: "url", icon: "icon" };
context.keys = { text: "text", description: "url", icon: "icon", id: "id", command: function () "tabs.select" };
context.compare = CompletionContext.Sort.number;
context.filters = [CompletionContext.Filter.textDescription];
@@ -1349,6 +1349,7 @@ const Buffer = Module("buffer", {
return {
text: [i + ": " + (tab.label || "(Untitled)"), i + ": " + url],
id: i - 1,
url: url,
indicator: indicator,
icon: tab.image || DEFAULT_FAVICON

6
common/content/commandline.js
View File

@@ -877,10 +877,10 @@ const CommandLine = Module("commandline", {
switch (key) {
case "<LeftMouse>":
if (event.originalTarget.getAttributeNS(NS.uri, "highlight") == "URL buffer-list") {
event.preventDefault();
tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent, 10) - 1);
}
let command = event.originalTarget.getAttributeNS(NS.uri, "command");
if (command && dactyl.commands[command])
return dactyl.commands[command](event);
else
openLink(dactyl.CURRENT_TAB);
break;

12
common/content/configbase.js
View File

@@ -155,22 +155,22 @@ const ConfigBase = Class(ModuleBase, {
Disabled color: red;
!Normal color: black !important; background: white !important; font-weight: normal !important;
!StatusNormal color: white !important; background: inherit !important;
!StatusNormal color: inherit !important; background: inherit !important;
ErrorMsg color: white !important; background: red !important; font-weight: bold !important;
InfoMsg color: black !important; background: white !important;
StatusInfoMsg color: white !important; background: inherit !important;
StatusInfoMsg color: inherit !important; background: inherit !important;
LineNr color: orange !important; background: white !important;
ModeMsg color: black !important; background: white !important;
StatusModeMsg color: white !important; background: inherit !important;
StatusModeMsg color: inherit !important; background: inherit !important;
MoreMsg color: green !important; background: white !important;
StatusMoreMsg background: black !important;
StatusMoreMsg background: inherit !important;
Message white-space: normal; min-width: 100%; padding-left: 2em; text-indent: -2em; display: block;
NonText color: blue; min-height: 16px; padding-left: 2px;
*Preview color: gray;
Question color: green !important; background: white !important; font-weight: bold !important;
StatusQuestion color: green !important; background: black !important;
StatusQuestion color: green !important; background: inherit !important;
WarningMsg color: red !important; background: white !important;
StatusWarningMsg color: red !important; background: black !important;
StatusWarningMsg color: red !important; background: inherit !important;
!CmdLine;>* font-family: monospace !important; padding: 1px !important;
!StatusCmdLine>* color: white; background: black; font-weight: normal;

3
common/content/dactyl.js
View File

@@ -31,8 +31,9 @@ const Dactyl = Module("dactyl", {
// cheap attempt at compatibility
window.liberator = this;
modules.liberator = this;
this.observers = {};
this.commands = {};
this.modules = modules;
this.observers = {};
// NOTE: services.get("profile").selectedProfile.name doesn't return
// what you might expect. It returns the last _actively_ selected

4
common/content/dactyl.xul
View File

@@ -11,8 +11,8 @@
<!DOCTYPE overlay SYSTEM "dactyl.dtd" [
<!ENTITY and "&amp;&amp;">
<!ENTITY dactyl.content "chrome://dactyl/content/">
<!ENTITY commandline "window.dactyl &and; dactyl.modules.commandline">
<!ENTITY events "if (window.dactyl &and; dactyl.modules.loaded.events) dactyl.modules.events">
<!ENTITY commandline "if (window.dactyl) return dactyl.modules.commandline">
<!ENTITY events "if (window.dactyl &and; dactyl.modules.loaded.events) return dactyl.modules.events">
<!ENTITY status "dactyl-statusline-field-">
]>

3
common/content/tabs.js
View File

@@ -33,6 +33,9 @@ const Tabs = Module("tabs", {
if (config.hasTabbrowser)
config.tabStrip.collapsed = true; // FIXME: see 'stal' comment
dactyl.commands["tabs.select"] = function (event) {
tabs.select(event.originalTarget.getAttribute("identifier"));
};
},
_updateTabCount: function () {

3
common/modules/template.jsm
View File

@@ -50,7 +50,8 @@ const Template = Module("Template", {
bookmarkDescription: function (item, text)
<>
<a href={item.item.url} highlight="URL">{text || ""}</a>&#xa0;
<a xmlns:dactyl={NS} identifier={item.id} dactyl:command={item.command}
href={item.item.url} highlight="URL">{text || ""}</a>&#xa0;
{
!(item.extra && item.extra.length) ? "" :
<span class="extra-info">

6
common/modules/util.jsm
View File

@@ -811,16 +811,16 @@ const Util = Module("Util", {
return doc.createTextNode(String(node));
case "element":
let domnode = doc.createElementNS(node.namespace(), node.localName());
for each (let attr in node.@*)
for each (let attr in node.@*::*)
if (attr.name() != "highlight")
domnode.setAttributeNS(attr.namespace(), attr.name(), String(attr));
domnode.setAttributeNS(attr.namespace(), attr.localName(), String(attr));
else {
domnode.setAttributeNS(NS.uri, "highlight", String(attr));
for each (let h in String.split(attr, " "))
highlight.loaded[h] = true;
}
for each (let child in node.*)
for each (let child in node.*::*)
domnode.appendChild(xmlToDom(child, doc, nodes));
if (nodes && node.@key)
nodes[node.@key] = domnode;