From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 14 Jan 2014 12:50:13 +0000 (+0100)
Subject: kivi.popup_dialog(): Unterstützung für bereits existierende DIVs
X-Git-Tag: release-3.1.0beta1~22^2~4^2~1
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2f4069ab9948acec08b4a26527ae9261f4ca5234;p=kivitendo-erp.git

kivi.popup_dialog(): Unterstützung für bereits existierende DIVs

Damit muss kein AJAX-Call mehr gemacht werden, sondern man kann den
DIV initial versteckt rendern und dann beliebig oft
anzeigen (öffnen)/verstecken (schließen).
---

diff --git a/js/kivi.js b/js/kivi.js
index 2c2811027..81a978fc1 100644
--- a/js/kivi.js
+++ b/js/kivi.js
@@ -59,11 +59,16 @@ namespace("kivi", function(ns) {
     return namespace(parts[1])[ parts[2] ];
   };
 
-  // Open a modal jQuery UI popup dialog. The content is loaded via AJAX.
+  // Open a modal jQuery UI popup dialog. The content can be either
+  // loaded via AJAX (if the parameter 'url' is given) or simply
+  // displayed if it exists in the DOM already (referenced via
+  // 'id'). If an existing DOM div should be used then the element
+  // won't be removed upon closing the dialog which allows re-opening
+  // it later on.
   //
   // Parameters:
   // - id: dialog DIV ID (optional; defaults to 'jqueryui_popup_dialog')
-  // - url, data, type: passed as the first three arguments to the $.ajax() call
+  // - url, data, type: passed as the first three arguments to the $.ajax() call if an AJAX call is made, otherwise ignored.
   // - dialog: an optional object of options passed to the $.dialog() call
   ns.popup_dialog = function(params) {
     var dialog;
@@ -79,9 +84,15 @@ namespace("kivi", function(ns) {
         // User supplied options:
       params.dialog || { },
       { // Options that must not be changed:
-        close: function(event, ui) { dialog.remove(); }
+        close: function(event, ui) { if (params.url) dialog.remove(); else dialog.dialog('close'); }
       });
 
+    if (!params.url) {
+      // Use existing DOM element and show it. No AJAX call.
+      dialog = $('#' + id).dialog(dialog_params);
+      return true;
+    }
+
     $('#' + id).remove();
 
     dialog = $('<div style="display:none" class="loading" id="' + id + '"></div>').appendTo('body');