Unterstützung für $::form->{fokus} entfernt, weil zu anfällig.

behebt #2028

diff --git a/SL/Layout/None.pm b/SL/Layout/None.pm
index ac7d5fcbe6109d8e68bc9afe3a6e157c4bd13ec6..ff82d8e1c30cd7fdea9553078e53f2b04ff3bc1e 100644 (file)
--- a/SL/Layout/None.pm
+++ b/SL/Layout/None.pm
@@ -30,10 +30,9 @@ sub _setup_formats {
 }
 
 sub _setup_focus {
-  if ($::request->{layout}->focus || $::form->{fokus}) {
+  if ($::request->{layout}->focus) {
     return $::form->parse_html_template('layout/focus_setup', {
       focus => $::request->{layout}->focus,
-      fokus => $::form->{fokus},
     })
   } else {
     return ();

diff --git a/js/common.js b/js/common.js
index 298d5a2cbee2fe4cdf2e36ef1c9d0618e0e2a48f..cabc6507ed0a49beccb02f6a92692a76f2c62473 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -166,7 +166,6 @@ $(document).ready(function () {
   });
   // legacy. sone forms install these
   if (typeof fokus == 'function') { fokus(); return; }
-  if (focus_by_name('fokus'))        return;
   if (focus_by_name('cursor_fokus')) return;
   set_cursor_to_first_element();
 });

diff --git a/templates/webpages/layout/focus_setup.html b/templates/webpages/layout/focus_setup.html
index 22bb2a280bfa969d61337767beb8cef4456516fe..e97fb69dc2a94fe5d8e1900b8ff1fa71ac8e5fec 100644 (file)
--- a/templates/webpages/layout/focus_setup.html
+++ b/templates/webpages/layout/focus_setup.html
@@ -1 +1 @@
-function fokus(){ [% IF focus %]$('[% focus %]').focus()[% ELSE %][% fokus %].focus()[% END %] }
+function fokus(){ [% IF focus %]$('[% focus %]').focus()[% END %] }