X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fcommon.js;h=b89a5b41ef49b2a976bdea84af4885287cef58c8;hb=a3fbb2f841cb533264f1b3c839f7ded19cdeca6c;hp=d2594a2778b551007302afe7f81fdee617cb43b9;hpb=a4d38233df45f80fb98c503108b40294d212653a;p=kivitendo-erp.git

diff --git a/js/common.js b/js/common.js
index d2594a277..b89a5b41e 100644
--- a/js/common.js
+++ b/js/common.js
@@ -162,28 +162,37 @@ function focus_by_name(name){
 
 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;
-  }
+  var id = params.id ? params.id : 'jqm_popup_dialog';
 
   $('#' + 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();
   });
 
+  $.ajax({
+    url:     params.url,
+    data:    params.data,
+    type:    params.type,
+    success: function(new_html) { $(content).html(new_html); }
+  });
+
   return true;
 }
 
+function close_jqm_window(params) {
+  params = params || { };
+  var url = params.url;
+  var id  = params.id ? params.id : 'jqm_popup_dialog';
+
+  $('#' + id).jqmClose()();
+}
+
 $(document).ready(function () {
   // initialize all jQuery UI tab elements:
   $(".tabwidget").each(function(idx, element) { $(element).tabs(); });
@@ -191,6 +200,11 @@ $(document).ready(function () {
   $('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; }
   if (focus_by_name('cursor_fokus')) return;