diff --git a/content/bookmarks.js b/content/bookmarks.js
index cf04000b..0319e532 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -269,22 +269,19 @@ function Bookmarks() //{{{
return;
}
+ var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "
" +
+ "
| title | URL |
";
for (var i = 0; i < items.length; i++)
{
- var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "
" +
- "| title | URL |
";
- for (var i = 0; i < items.length; i++)
- {
- var title = vimperator.util.escapeHTML(items[i][1]);
- if (title.length > 50)
- title = title.substr(0, 47) + "...";
- var url = vimperator.util.escapeHTML(items[i][0]);
- list += "| " + title + " | " + url + " |
";
- }
- list += "
";
-
- vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+ var title = vimperator.util.escapeHTML(items[i][1]);
+ if (title.length > 50)
+ title = title.substr(0, 47) + "...";
+ var url = vimperator.util.escapeHTML(items[i][0]);
+ list += "| " + title + " | " + url + " |
";
}
+ list += "
";
+
+ vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
}
}
@@ -505,22 +502,18 @@ function History() //{{{
return;
}
+ var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "
" +
+ "| title | URL |
";
for (var i = 0; i < items.length; i++)
{
- var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "
" +
- "| title | URL |
";
- for (var i = 0; i < items.length; i++)
- {
- var title = vimperator.util.escapeHTML(items[i][1]);
- if (title.length > 50)
- title = title.substr(0, 47) + "...";
- var url = vimperator.util.escapeHTML(items[i][0]);
- list += "| " + title + " | " + url + " |
";
- }
- list += "
";
-
- vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
+ var title = vimperator.util.escapeHTML(items[i][1]);
+ if (title.length > 50)
+ title = title.substr(0, 47) + "...";
+ var url = vimperator.util.escapeHTML(items[i][0]);
+ list += "| " + title + " | " + url + " |
";
}
+ list += "
";
+ vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
}
}
//}}}
diff --git a/content/buffers.js b/content/buffers.js
index 8d6288f6..3a51251c 100644
--- a/content/buffers.js
+++ b/content/buffers.js
@@ -204,7 +204,7 @@ function Buffer() //{{{
list += "| " + number + " | " + indicator +
" | " + title +
- " | " + url + " |
";
+ "" + url + " | ";
}
list += "";
diff --git a/content/ui.js b/content/ui.js
index f73d6316..9504be97 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -706,8 +706,34 @@ function CommandLine() //{{{
break;
case "":
- case "":
+ if (event.originalTarget.className == "hl-URL buffer-list")
+ {
+ vimperator.tabs.select(parseInt(event.originalTarget.parentNode.parentNode.firstChild.textContent) - 1);
+ close_window = true;
+ break;
+ }
+ else if (event.originalTarget.localName.toLowerCase() == "a")
+ {
+ vimperator.open(event.originalTarget.textContent);
+ break;
+ }
+ case "": // for those not owning a 3-button mouse
+ case "":
+ if (event.originalTarget.localName.toLowerCase() == "a")
+ {
+ var where = /\btabopen\b/.test(vimperator.options["activate"]) ?
+ vimperator.NEW_TAB : vimperator.NEW_BACKGROUND_TAB;
+ vimperator.open(event.originalTarget.textContent, where);
+ }
+ break;
+
+ // let firefox handle those to select table cells or show a context menu
case "":
+ case "":
+ case "":
+ break;
+
+ // XXX: what's that for? --mst
case "":
if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
; // fall through
diff --git a/skin/vimperator.css b/skin/vimperator.css
index 884e12b5..c4812b2d 100644
--- a/skin/vimperator.css
+++ b/skin/vimperator.css
@@ -4,7 +4,7 @@
#vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow {
-moz-user-focus: ignore;
- overflow: -moz-scrollbars-none;
+ overflow: -moz-scrollbars-none !important; /* does not seem to work fully */
border-width: 0px !important;
-moz-appearance: none !important; /* prevent an ugly 3D border */
}
@@ -112,11 +112,21 @@
background-color: #FF6060 !important; /* light red */
color: black !important;
}
+.hl-URL {
+ background-color: white;
+ color: green;
+ text-decoration: none;
+}
+a.hl-URL:hover {
+ text-decoration: underline;
+}
/* MOW */
#vimperator-multiline-output {
overflow: hidden;
+ background-color: white;
+ color: black;
}
#vimperator-multiline-output-content {
@@ -139,4 +149,8 @@
padding: 0px 2px;
}
+#vimperator-multiline-output-content a {
+ cursor: pointer;
+}
+
/* vim: set fdm=marker sw=4 ts=4 et: */