diff options
author | Brendan Taylor <whateley@gmail.com> | 2011-05-08 10:21:06 -0600 |
---|---|---|
committer | Brendan Taylor <whateley@gmail.com> | 2011-05-08 10:21:06 -0600 |
commit | 2cfd07b934aa672d36992abe7308d5b497adbbbf (patch) | |
tree | a591da4625d5c6d873cc6d5453abe2a445d751f7 /examples/data/scripts/follow.js | |
parent | 76033ba05cad1a2ce720b9b22b3b3f57626ff308 (diff) | |
parent | f39423189b7e564656a241c22ff6eb7fc03bd8c9 (diff) |
Merge remote-tracking branch 'mathstuf/dev/improve-follow' into experimental
Diffstat (limited to 'examples/data/scripts/follow.js')
-rw-r--r-- | examples/data/scripts/follow.js | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index b7b0d82..782b1d1 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -16,7 +16,16 @@ uzbldivid = 'uzbl_link_hints'; uzbl.follow = function() { // Export charset = arguments[0]; - newwindow = arguments[2]; + if (arguments[2] == 'click') { + newwindow = false; + returnuri = false; + } else if (arguments[2] == 'newwindow') { + newwindow = true; + returnuri = false; + } else if (arguments[2] == 'returnuri') { + newwindow = false; + returnuri = true; + } var keypress = arguments[1]; return arguments.callee.followLinks(keypress); @@ -169,9 +178,13 @@ uzbl.follow.reDrawHints = function(elems, chars) { elements.forEach(function(el, i) { var label = labels[i]; var pos = positions[i]; - var doc = uzbl.follow.getDocument(el); - var h = uzbl.follow.generateHint(doc, el, label, pos[0], pos[1]); - doc.hintdiv.appendChild(h); + try { + var doc = uzbl.follow.getDocument(el); + var h = uzbl.follow.generateHint(doc, el, label, pos[0], pos[1]); + doc.hintdiv.appendChild(h); + } catch (err) { + // Unable to attach label -> shrug it off and continue + } }); } @@ -222,7 +235,7 @@ uzbl.follow.followLinks = function(follow) { //var desc = '*[title], img[alt], applet[alt], area[alt], input[alt]'; //var image = 'img, input[type=image]'; - if(newwindow) + if(newwindow || returnuri) var res = this.query(uri); else var res = this.query(followable); @@ -237,6 +250,11 @@ uzbl.follow.followLinks = function(follow) { // clear all of our hints this.clearHints(); + if (returnuri) { + var uri = el.src || el.href; + return "XXXRETURNED_URIXXX" + uri + } + if (newwindow) { // we're opening a new window using the URL attached to this element var uri = el.src || el.href; |