X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=d2594a2778b551007302afe7f81fdee617cb43b9;hb=56b91fb4030432fde4159c11a0ca97a7571535f3;hp=86b869c3c878c6de9150b93243d5535834843933;hpb=3c2e635c3d0f16fc53c49fd7a4fa91ab7e92796b;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index 86b869c3c..d2594a277 100644
--- 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) {
-  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) {
@@ -160,13 +160,39 @@ function focus_by_name(name){
   return false;
 }
 
+function open_jqm_window(params) {
+  params = params || { };
+  var url = params.url;
+  var id  = params.id ? params.id : 'jqm_popup_dialog';
+
+  if (params.data) {
+    var data  = typeof params.data === "string" ? params.data : $.param(params.data);
+    url      += (/\?/.exec(url) ? "&" : "?") + data;
+  }
+
+  $('#' + id).remove();
+  var div     = $('<div id="' + id + '" class="jqmWindow jqModal_overlay ' + (params.class || '') + '"></div>').hide().appendTo('body');
+  var close   = $('<div class="close"></div>').appendTo(div);
+  var content = $('<div class="overlay_content"></div>').appendTo(div);
+  div.jqm({ modal: true });
+  div.jqmShow();
+  $.ajax({ url: url, success: function(new_html) { $(content).html(new_html); } });
+  $(close).click(function() {
+    div.jqmClose();
+  });
+
+  return true;
+}
+
 $(document).ready(function () {
+  // initialize all jQuery UI tab elements:
+  $(".tabwidget").each(function(idx, element) { $(element).tabs(); });
+
   $('input').focus(function(){
     if (focussable(this)) window.focused_element = this;
   });
   // 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();
 });