X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=285b02fef203f5dc165732c0b73a4d33580ade65;hb=9c76bacaa1bfbefc80f7d595ca47ec882266dc70;hp=b4784f4b11b870a6cc3dd424f5e54040aae6b6cd;hpb=030d9691420627f3af04f7408ba1975a6ce855d7;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index b4784f4b1..285b02fef 100644
--- a/js/common.js
+++ b/js/common.js
@@ -192,22 +192,53 @@ function focus_by_name(name){
   return false;
 }
 
-$(document).ready(function () {
+$(function () {
   $('input').focus(function(){
     if (focussable(this)) window.focused_element = this;
   });
 
-  // Lowest priority: first focussable element in form.
-  set_cursor_to_first_element();
+  // setting focus inside a tabbed area fails if this is encountered before the tabbing is complete
+  // in that case the elements count as hidden and jquery aborts .focus()
+  setTimeout(function(){
+    // Lowest priority: first focussable element in form.
+    set_cursor_to_first_element();
+
+    // Medium priority: class set in template
+    var initial_focus = $(".initial_focus").filter(':visible')[0];
+    if (initial_focus)
+      $(initial_focus).focus();
+
+    // special: honour focus_position
+    // if no higher priority applies set focus to the appropriate element
+    if ($("#display_row")[0] && kivi.myconfig.focus_position) {
+      switch(kivi.myconfig.focus_position) {
+        case 'last_partnumber'  : $('#display_row tr.row:gt(-3):lt(-1) input[name*="partnumber"]').focus(); break;
+        case 'last_description' : $('#display_row tr.row:gt(-3):lt(-1) input[name*="description"]').focus(); break;
+        case 'last_qty'         : $('#display_row tr.row:gt(-3):lt(-1) input[name*="qty"]').focus(); break;
+        case 'new_partnumber'   : $('#display_row tr:gt(1) input[name*="partnumber"]').focus(); break;
+        case 'new_description'  : $('#display_row tr:gt(1) input[name*="description"]').focus(); break;
+        case 'new_qty'          : $('#display_row tr:gt(1) input[name*="qty"]').focus(); break;
+      }
+    }
 
-  // Medium priority: class set in template
-  var initial_focus = $(".initial_focus").filter(':visible')[0];
-  if (initial_focus)
-    $(initial_focus).focus();
+    // all of this screws with the native location.hash focus, so reimplement this as well
+    if (location.hash) {
+      var hash_name = location.hash.substr(1);
+      var $hash_by_id = $(location.hash + ':visible');
+      if ($hash_by_id.length > 0) {
+        $hash_by_id.get(0).focus();
+      } else {
+        var $by_name = $('[name=' + hash_name + ']:visible');
+        if ($by_name.length > 0) {
+          $by_name.get(0).focus();
+        }
+      }
+    }
 
-  // legacy. sone forms install these
-  if (typeof fokus == 'function') { fokus(); return; }
-  if (focus_by_name('cursor_fokus')) return;
+    // legacy. some forms install these
+    if (typeof fokus == 'function') { fokus(); return; }
+    if (focus_by_name('cursor_fokus')) return;
+  }, 0);
 });
 
 $('form').submit(function(){