Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / js / common.js

diff --git a/js/common.js b/js/common.js
index 86b869c3c878c6de9150b93243d5535834843933..2bc91078cd192888daa2481f2b6c02e04ea185db 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -45,30 +45,30 @@ function set_longdescription_window(input_name) {
   }
 
 function check_right_number_format(input_name) {
   }
 
 function check_right_number_format(input_name) {

-  if(decpoint == thpoint) {
+  if(decpoint && thpoint && thpoint == decpoint) {

     return show_alert_and_focus(input_name, wrongNumberFormat);
   }
     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) {
 }
 
 function check_right_date_format(input_name) {


@@ -161,12 +161,35 @@ function focus_by_name(name){
 }
 
 $(document).ready(function () {
 }
 
 $(document).ready(function () {

+  // initialize all jQuery UI tab elements:
+  $(".tabwidget").each(function(idx, element) {
+    var $element = $(element);
+    var tabsParams = {};
+
+    var elementId = $element.attr('id');
+    if( elementId ) {
+      var cookieName = 'jquery_ui_tab_'+ elementId;
+
+      tabsParams.active = $.cookie(cookieName);
+      tabsParams.activate = function(event, ui) {
+        var i = ui.newTab.parent().children().index(ui.newTab);
+        $.cookie(cookieName, i);
+      };
+    }
+
+    $element.tabs(tabsParams);
+  });
+

   $('input').focus(function(){
     if (focussable(this)) window.focused_element = this;
   });
   $('input').focus(function(){
     if (focussable(this)) window.focused_element = this;
   });

+
+  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; }
   // 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();
 });
   if (focus_by_name('cursor_fokus')) return;
   set_cursor_to_first_element();
 });