simplifiy follow.sh.

Now it executes less processes and works a bti faster.

2 files changed, 9 insertions, 21 deletions

diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js
index 763b0d9..77c40cd 100644
--- a/examples/data/scripts/follow.js
+++ b/examples/data/scripts/follow.js
@@ -17,7 +17,6 @@ var doc = document;
 var win = window;
 var links = document.links;
 var forms = document.forms;
-var rv = "";
 //Make onlick-links "clickable"
 try {
     HTMLElement.prototype.click = function() {
@@ -131,6 +130,7 @@ function clickElem(item) {
         if (name == 'A') {
             item.click();
             window.location = item.href;
+			return "XXXRESET_MODEXXX";
         } else if (name == 'INPUT') {
 	    var type;
 	    try {
@@ -141,15 +141,15 @@ function clickElem(item) {
             if (type == 'TEXT' || type == 'SEARCH' || type == 'PASSWORD') {
                 item.focus();
                 item.select();
-                rv="XXXEMIT_FORM_ACTIVEXXX";
+                return "XXXEMIT_FORM_ACTIVEXXX";
             } else {
                 item.click();
-                rv="XXXRESET_MODEXXX";
+                return "XXXRESET_MODEXXX";
             }
         } else if (name == 'TEXTAREA' || name == 'SELECT') {
             item.focus();
             item.select();
-            rv="XXXEMIT_FORM_ACTIVEXXX";
+            return "XXXEMIT_FORM_ACTIVEXXX";
         } else {
             item.click();
             window.location = item.href;
@@ -251,7 +251,7 @@ function followLinks(follow) {
     var oldDiv = doc.getElementById(uzbldivid);
     var leftover = [[], []];
     if (s.length == len && linknr < elems[0].length && linknr >= 0) {
-        clickElem(elems[0][linknr]);
+        return clickElem(elems[0][linknr]);
     } else {
         for (var j = 0; j < elems[0].length; j++) {
             var b = true;
diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh
index af9e277..ba59575 100755
--- a/examples/data/scripts/follow.sh
+++ b/examples/data/scripts/follow.sh
@@ -15,19 +15,7 @@ shift
 title=$1;
 shift
 
-echo 'script @scripts_dir/follow.js "@{follow_hint_keys} '$1'"' | socat - unix-connect:$socket
-
-# Read variable set by script. If it equals XXXEMIT_FORM_ACTIVEXXX emit
-# FORM_ACTIVE event. If it equals XXXEMIT_ROOT_ACTIVEXXX emit ROOT_ACTIVE
-# event.
-rv=$(echo 'js rv' | socat - unix-connect:$socket)
-
-echo $rv \
-  | grep -q XXXEMIT_FORM_ACTIVEXXX \
-  && echo 'event FORM_ACTIVE' \
-  | socat - unix-connect:$socket
-
-echo $rv \
-  | grep -q XXXRESET_MODEXXX \
-  && echo 'set mode =' \
-  | socat - unix-connect:$socket
+case $(echo 'script @scripts_dir/follow.js "@{follow_hint_keys} '$1'"' | socat - unix-connect:$socket) in
+  *XXXEMIT_FORM_ACTIVEXXX*) echo 'event FORM_ACTIVE' | socat - unix-connect:$socket ;;
+  *XXXRESET_MODEXXX*) echo 'set mode=' | socat - unix-connect:$socket ;;
+esac