From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 19 Apr 2018 20:43:35 +0000 (+0000)
Subject: Allow more advanced element focusing
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=6872a6750379b6c17cf6a6dfec6150ade78f52a0

Allow more advanced element focusing

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14765 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/templates/default/js/default.js b/templates/default/js/default.js
index d0e4dbcb..f5551726 100644
--- a/templates/default/js/default.js
+++ b/templates/default/js/default.js
@@ -266,13 +266,20 @@ function checkForm(smaction) {
      */
         var f = document.forms.length;
         var i = 0;
+        var remembered_form = -1;
         var pos = -1;
+        var remembered_pos = -1;
         while( pos == -1 && i < f ) {
             var e = document.forms[i].elements.length;
             var j = 0;
             while( pos == -1 && j < e ) {
                 if ( document.forms[i].elements[j].type == 'text' || document.forms[i].elements[j].type == 'password' || document.forms[i].elements[j].type == 'textarea' ) {
-                    pos = j;
+                    if ( document.forms[i].elements[j].id.substring(0, 13) == '__lastfocus__' ) {
+                        remembered_pos = j;
+                        remembered_form = i;
+                    } else if ( document.forms[i].elements[j].id.substring(0, 11) != '__nofocus__' ) {
+                        pos = j;
+                    }
                 }
                 j++;
             }
@@ -280,6 +287,8 @@ function checkForm(smaction) {
         }
         if( pos >= 0 ) {
             document.forms[i-1].elements[pos].focus();
+        } else if ( remembered_pos >= 0 ) {
+            document.forms[remembered_form].elements[remembered_pos].focus();
         }
     }
 }