merge hyperlinked MOW URLs feature

content/bookmarks.js

@@ -269,22 +269,19 @@ function Bookmarks() //{{{
                 return;
             }
 
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                var title = vimperator.util.escapeHTML(items[i][1]);
-                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
+                if (title.length > 50)
-                for (var i = 0; i < items.length; i++)
+                    title = title.substr(0, 47) + "...";
-                {
+                var url = vimperator.util.escapeHTML(items[i][0]);
-                    var title = vimperator.util.escapeHTML(items[i][1]);
+                list += "<tr><td>" + title + "</td><td style=\"width: 100%\"><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
-                    if (title.length > 50)
-                        title = title.substr(0, 47) + "...";
-                    var url = vimperator.util.escapeHTML(items[i][0]);
-                    list += "<tr><td>" + title + "</td><td style=\"color: green; width: 100%\">" + url + "</td></tr>";
-                }
-                list += "</table>";
-
-                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
             }
+            list += "</table>";
+
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
         }
     }
 
@@ -505,22 +502,18 @@ function History() //{{{
                 return;
             }
 
+            var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                       "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
             for (var i = 0; i < items.length; i++)
             {
-                var list = ":" + vimperator.util.escapeHTML(vimperator.commandline.getCommand()) + "<br/>" +
+                var title = vimperator.util.escapeHTML(items[i][1]);
-                           "<table><tr align=\"left\" class=\"hl-Title\"><th>title</th><th>URL</th></tr>";
+                if (title.length > 50)
-                for (var i = 0; i < items.length; i++)
+                    title = title.substr(0, 47) + "...";
-                {
+                var url = vimperator.util.escapeHTML(items[i][0]);
-                    var title = vimperator.util.escapeHTML(items[i][1]);
+                list += "<tr><td>" + title + "</td><td><a href=\"#\" class=\"hl-URL\">" + url + "</a></td></tr>";
-                    if (title.length > 50)
-                        title = title.substr(0, 47) + "...";
-                    var url = vimperator.util.escapeHTML(items[i][0]);
-                    list += "<tr><td>" + title + "</td><td style=\"color: green;\">" + url + "</td></tr>";
-                }
-                list += "</table>";
-
-                vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
             }
+            list += "</table>";
+            vimperator.commandline.echo(list, vimperator.commandline.HL_NORMAL, true);
         }
     }
     //}}}

content/buffers.js

@@ -204,7 +204,7 @@ function Buffer() //{{{
 
                 list += "<tr><td align=\"right\">  " + number + "</td><td>" + indicator +
                         "</td><td style=\"width: 250px; max-width: 500px; overflow: hidden;\">" + title +
-                        "</td><td><span style=\"color: green\">" + url + "</span></td></tr>";
+                        "</td><td><a href=\"#\" class=\"hl-URL buffer-list\">" + url + "</a></td></tr>";
             }
             list += "</table>";
 

content/ui.js

@@ -706,8 +706,34 @@ function CommandLine() //{{{
                 break;
 
             case "<LeftMouse>":
-            case "<A-LeftMouse>":
+                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 "<A-LeftMouse>": // for those not owning a 3-button mouse
+            case "<MiddleMouse>":
+                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 "<C-LeftMouse>":
+            case "<RightMouse>":
+            case "<C-S-LeftMouse>":
+                break;
+
+            // XXX: what's that for? --mst
             case "<S-LeftMouse>":
                 if (/^(end|more(-help)?)-prompt$/.test(event.target.id))
                     ; // fall through

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: */