X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=5f2184e43335a3de14efdabc2c0947134875c425;hb=96e32f352f3937bdd2deb279a55d94871396d9c0;hp=1911bef777a8d05db194e5e7ea07c30e834feb54;hpb=28c2764b1808722087c70f5f9e0e5d0004524bf4;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 1911bef77..5f2184e43 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,31 +1,3 @@
-if (!window.a_onload_functions)   a_onload_functions   = new Object();
-if (!window.a_onsubmit_functions) a_onsubmit_functions = new Object();
-if (!window.a_onfocus_functions)  a_onfocus_functions  = new Object();
-window.focused_element = null;
-
-function setupPoints(numberformat, wrongFormat) {
-  decpoint = numberformat.substring((numberformat.substring(1, 2).match(/\.|\,/) ? 5 : 4), (numberformat.substring(1, 2).match(/\.|\,/) ? 6 : 5));
-  if (numberformat.substring(1, 2).match(/\.|\,/)) {
-    thpoint = numberformat.substring(1, 2);
-  }
-  else {
-    thpoint = null;
-  }
-  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";
-}
-
-function setupDateFormat(setDateFormat, setWrongDateFormat) {
-  dateFormat = setDateFormat;
-  wrongDateFormat = setWrongDateFormat + " ( " + setDateFormat + " ) ";
-  formatArray = new Array();
-  if(dateFormat.match(/^\w\w\W/)) {
-    seperator = dateFormat.substring(2,3);
-  }
-  else {
-    seperator = dateFormat.substring(4,5);
-  }
-}
-
 function centerParms(width,height,extra) {
   xPos = (screen.width - width) / 2;
   yPos = (screen.height - height) / 2;
@@ -38,96 +10,6 @@ function centerParms(width,height,extra) {
   return string;
 }
 
-function set_longdescription_window(input_name) {
-  var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";
-  var name = document.getElementsByName(input_name)[0].value;
-  url = "common.pl?" +
-    "INPUT_ENCODING=UTF-8&" +
-    "action=set_longdescription&" +
-    "longdescription=" + encodeURIComponent(document.getElementsByName(input_name)[0].value) + "&" +
-    "input_name=" + encodeURIComponent(input_name) + "&"
-  window.open(url, "_new_generic", parm);
-  }
-
-function check_right_number_format(input_name) {
-  if(decpoint == thpoint) {
-    return show_alert_and_focus(input_name, wrongNumberFormat);
-  }
-  if(decpoint == ',') {
-    var decnumbers = input_name.value.split(',');
-  }
-  else {
-    var decnumbers = input_name.value.split('.');
-  }
-  if(decnumbers.length == 2) {
-    if(decnumbers[1].length > 2)  {
-     /* return show_alert_and_focus(input_name, wrongNumberFormat); */
-    }
-  }
-  else {
-    if(decnumbers.length > 2) {
-      return show_alert_and_focus(input_name, wrongNumberFormat);
-    }
-    if(!thpoint) {
-      if(decnumbers[0].match(/\D/)) {
-        return show_alert_and_focus(input_name, wrongNumberFormat);
-      }
-    }
-  }
-}
-
-function check_right_date_format(input_name) {
-  if(input_name.value == "") {
-    return true;
-  }
-  var matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + "\$","ig");
-  if(!(dateFormat.lastIndexOf("y") == 3) && !matching.test(input_name.value)) {
-    matching = new RegExp(dateFormat.replace(/\w/g, '\\d') + '\\d\\d\$', "ig");
-    if(!matching.test(input_name.value)) {
-      return show_alert_and_focus(input_name, wrongDateFormat);
-    }
-  }
-  else {
-    if (dateFormat.lastIndexOf("y") == 3 && !matching.test(input_name.value)) {
-      return show_alert_and_focus(input_name, wrongDateFormat);
-    }
-  }
-}
-
-function validate_dates(input_name_1, input_name_2) {
-  var tempArray1 = new Array();
-  var tempArray2 = new Array();
-  tempArray1 = getDateArray(input_name_1);
-  tempArray2 = getDateArray(input_name_2);
-  if(check_right_date_format(input_name_1) && check_right_date_format(input_name_2)) {
-    if(!((new Date(tempArray2[0], tempArray2[1], tempArray2[2])).getTime() >= (new Date(tempArray1[0], tempArray1[1], tempArray1[2])).getTime())) {
-      show_alert_and_focus(input_name_1, wrongDateFormat);
-      return show_alert_and_focus(input_name_2, wrongDateFormat);
-    }
-    if(!((new Date(tempArray2[0], tempArray2[1], tempArray2[2])).getTime() >= (new Date(1900, 1, 1)).getTime())) {
-      show_alert_and_focus(input_name_1, wrongDateFormat);
-      return show_alert_and_focus(input_name_2, wrongDateFormat);
-    }
-  }
-}
-
-function getDateArray(input_name) {
-  formatArray[2] = input_name.value.substring(dateFormat.indexOf("d"), 2);
-  formatArray[1] = input_name.value.substring(dateFormat.indexOf("m"), 2);
-  formatArray[0] = input_name.value.substring(dateFormat.indexOf("y"), (dateFormat.length == 10 ? 4 : 2));
-  if(dateFormat.length == 8) {
-    formatArray[0] += (formatArray[0] < 70 ? 2000 : 1900);
-  }
-  return formatArray;
-}
-
-function show_alert_and_focus(input_name, errorMessage) {
-  input_name.select();
-  alert(errorMessage + "\n\r\n\r--> " + input_name.value);
-  input_name.focus();
-  return false;
-}
-
 function get_input_value(input_name) {
   var the_input = document.getElementsByName(input_name);
   if (the_input && the_input[0])
@@ -135,26 +17,10 @@ function get_input_value(input_name) {
   return '';
 }
 
-a_onfocus_functions["focus_listener"] = (function (event) {
-  if (focussable(event.target)) window.focused_element = event.target;
-});
-
-a_onsubmit_functions["get_cursor_position"] = (function () {
-  if (window.focused_element)
-    document.forms[0].cursor_fokus.value = window.focused_element.name;
-});
-
 function set_cursor_position(n) {
-  document.getElementsByName(n)[0].focus();
+  $('[name=' + n + ']').focus();
 }
 
-a_onload_functions["restore_cursor_position"] = (function () {
-  var e = document.getElementsByName('cursor_fokus')[0];
-  if (e) var f = document.getElementsByName(e.value)[0];
-  if (focussable(f)) set_cursor_position(f.name)
-    else set_cursor_to_first_element();
-});
-
 function focussable(e) {
   return e && e.name && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
 }
@@ -167,16 +33,70 @@ function set_cursor_to_first_element(){
         try { df[f][i].focus(); return } catch (er) { }
 }
 
-function add_event(e, type, fn, c) {
-  var ret = 0;
-  if (e.addEventListener) e.addEventListener(type, fn, c)
-  else if (e.attachEvent) e.attachEvent('on' + type, fn)
-  else e['on' + type] = fn;
+function getElementByIndirectName(name){
+  var e = document.getElementsByName(name)[0];
+  if (e) return document.getElementsByName(e.value)[0];
 }
 
-function do_load_events() {
-  for (var name in window.a_onload_functions)   add_event(window, "load",   window.a_onload_functions[name],   false);
-  for (var name in window.a_onsubmit_functions) add_event(window, "submit", window.a_onsubmit_functions[name], false);
-  for (var name in window.a_onfocus_functions)  add_event(window, "focus",  window.a_onfocus_functions[name],  false);
+function focus_by_name(name){
+  var f = getElementByIndirectName(name);
+  if (focussable(f)) {
+    set_cursor_position(f.name);
+    return true;
+  }
+  return false;
 }
-do_load_events();
+
+$(function () {
+  $('input').focus(function(){
+    if (focussable(this)) window.focused_element = this;
+  });
+
+  // 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;
+      }
+    }
+
+    // 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. some forms install these
+    if (typeof fokus == 'function') { fokus(); return; }
+    if (focus_by_name('cursor_fokus')) return;
+  }, 0);
+});
+
+$('form').submit(function(){
+  if (window.focused_element)
+    document.forms[0].cursor_fokus.value = window.focused_element.name;
+});