X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=43bb7de4de81f12f0b81a62309ad00bf8038d3eb;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=69915eec4d07e117790dfc8e4badfdf7819fa164;hpb=f5e340dfd90576faa5130ca4530840e6d2ce5e81;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 69915eec4..43bb7de4d 100644
--- a/js/common.js
+++ b/js/common.js
@@ -1,17 +1,12 @@
-
-if (!window.a_onload_functions)   var a_onload_functions   = new Object();
-if (!window.a_onsubmit_functions) var a_onsubmit_functions = new Object();
-
-
 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); 
+    thpoint = numberformat.substring(1, 2);
   }
   else {
     thpoint = null;
   }
-  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";  
+  wrongNumberFormat = wrongFormat + " ( " + numberformat + " ) ";
 }
 
 function setupDateFormat(setDateFormat, setWrongDateFormat) {
@@ -38,52 +33,77 @@ function centerParms(width,height,extra) {
   return string;
 }
 
-function escape_more(s) {
-  s = escape(s);
-  return s.replace(/\+/g, '%2b');
-}
-
-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?" +
-    "action=set_longdescription&" +
-    "longdescription=" + escape_more(document.getElementsByName(input_name)[0].value) + "&" +
-    "input_name=" + escape_more(input_name) + "&"
-  window.open(url, "_new_generic", parm);
-  }
-
 function check_right_number_format(input_name) {
-  if(decpoint == thpoint) {
+  if(decpoint && thpoint && thpoint == decpoint) {
     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
-  if(decpoint == ',') {
-    var decnumbers = input_name.value.split(',');
+  var test_val = input_name.value;
+  if(thpoint && thpoint == ','){
+    test_val = test_val.replace(/,/g, '');
   }
-  else {
-    var decnumbers = input_name.value.split('.');
+  if(thpoint && thpoint == '.'){
+    test_val = test_val.replace(/\./g, '');
   }
-  if(decnumbers.length == 2) {
-    if(decnumbers[1].length > 2)  {
-      return show_alert_and_focus(input_name, wrongNumberFormat);
-    }
+  if(decpoint && decpoint == ','){
+    test_val = test_val.replace(/,/g, '.');
   }
-  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);
-      }
-    }
+  var forbidden = test_val.match(/[^\s\d\(\)\-\+\*\/\.]/g);
+  if (forbidden && forbidden.length > 0 ){
+    return show_alert_and_focus(input_name, wrongNumberFormat);
+  }
+
+  try{
+    eval(test_val);
+  }catch(err){
+    return show_alert_and_focus(input_name, wrongNumberFormat);
   }
+
 }
 
 function check_right_date_format(input_name) {
   if(input_name.value == "") {
     return true;
   }
+
+  if ( ( input_name.value.match(/^\d+$/ ) ) && !(dateFormat.lastIndexOf("y") == 3) ) {
+    // date shortcuts for entering date without separator for three date styles, e.g.
+    // 31122014 -> 12.04.2014
+    // 12312014 -> 12/31/2014
+    // 31122014 -> 31/12/2014
+
+    if (input_name.value.match(/^\d{8}$/)) {
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+    } else if (input_name.value.match(/^\d{6}$/)) {
+      // 120414 -> 12.04.2014
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)(\d\d)$/, "$1" + seperator + "$2" + seperator + "$3")
+    } else if (input_name.value.match(/^\d{4}$/)) {
+      // 1204 -> 12.04.2014
+      var today = new Date();
+      var year = today.getYear();
+      if (year < 999) year += 1900;
+      input_name.value = input_name.value.replace(/^(\d\d)(\d\d)$/, "$1" + seperator + "$2");
+      input_name.value = input_name.value + seperator + year;
+    } else  if ( input_name.value.match(/^\d{1,2}$/ ) ) {
+      // assume the entry is the day of the current month and current year
+      var today = new Date();
+      var day = input_name.value;
+      var month = today.getMonth() + 1;
+      var year = today.getYear();
+      if( day.length == 1 && day < 10) {
+        day='0'+day;
+      };
+      if(month<10) {
+        month='0'+month;
+      };
+      if (year < 999) year += 1900;
+      if ( dateFormat.lastIndexOf("d") == 1) {
+        input_name.value = day + seperator + month + seperator + year;
+      } else {
+        input_name.value = month + seperator + day + seperator + year;
+      }
+    };
+  }
+
   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");
@@ -92,7 +112,7 @@ function check_right_date_format(input_name) {
     }
   }
   else {
-    if (dateFormat.lastIndexOf("y") == 3 && !matching.test(input_name.value)) { 
+    if (dateFormat.lastIndexOf("y") == 3 && !matching.test(input_name.value)) {
       return show_alert_and_focus(input_name, wrongDateFormat);
     }
   }
@@ -131,7 +151,7 @@ function show_alert_and_focus(input_name, errorMessage) {
   input_name.focus();
   return false;
 }
-  
+
 function get_input_value(input_name) {
   var the_input = document.getElementsByName(input_name);
   if (the_input && the_input[0])
@@ -139,54 +159,55 @@ function get_input_value(input_name) {
   return '';
 }
 
-window.focused_element = null;
-document.addEventListener("focus", function(event){ 
-  var e = event.target;
-  if (is_element_focussable(e)) window.focused_element = e;
-}, true);
-
-function get_cursor_position() {
-  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();
 }
 
-function restore_cursor_position() {
-  var e = document.getElementsByName('cursor_fokus')[0];
-  var f = document.getElementsByName(e.value)[0];
-  if (is_element_focussable(f)) set_cursor_position(f.name)
-   else set_cursor_to_first_element();
-}
-
-function is_element_focussable(e) {
-  return e && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
+function focussable(e) {
+  return e && e.name && e.type != 'hidden' && e.type != 'submit' && e.disabled != true;
 }
 
 function set_cursor_to_first_element(){
   var df = document.forms;
   for (var f = 0; f < df.length; f++)
     for (var i = 0; i < df[f].length; i++)
-      if (is_element_focussable(df[f][i]))
+      if (focussable(df[f][i]))
         try { df[f][i].focus(); return } catch (er) { }
 }
-a_onload_functions["restore_cursor_position"] = restore_cursor_position;
-a_onsubmit_functions["get_cursor_position"]   = get_cursor_position;
-
-function do_load_events() {
-  var oldl = window.onload;
-  window.onload = function() {
-    if (oldl) oldl();
-    if (window.a_onload_functions) 
-      for (var name in window.a_onload_functions) 
-        a_onload_functions[name]();
-  }
-  window.onsubmit = function() {
-    if (window.a_onsubmit_functions) 
-      for (var name in window.a_onsubmit_functions) 
-        a_onsubmit_functions[name]();
+
+function getElementByIndirectName(name){
+  var e = document.getElementsByName(name)[0];
+  if (e) return document.getElementsByName(e.value)[0];
+}
+
+function focus_by_name(name){
+  var f = getElementByIndirectName(name);
+  if (focussable(f)) {
+    set_cursor_position(f.name);
+    return true;
   }
+  return false;
 }
-do_load_events();
+
+$(document).ready(function () {
+  $('input').focus(function(){
+    if (focussable(this)) window.focused_element = this;
+  });
+
+  // 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();
+
+  // legacy. sone forms install these
+  if (typeof fokus == 'function') { fokus(); return; }
+  if (focus_by_name('cursor_fokus')) return;
+});
+
+$('form').submit(function(){
+  if (window.focused_element)
+    document.forms[0].cursor_fokus.value = window.focused_element.name;
+});