summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/functions.js71
1 files changed, 33 insertions, 38 deletions
diff --git a/js/functions.js b/js/functions.js
index 25aa26d39..0622ff8e0 100755
--- a/js/functions.js
+++ b/js/functions.js
@@ -342,48 +342,43 @@ function displayDlg(title, id, param, callback) {
const query = { op: "dlg", method: id, param: param };
xhrPost("backend.php", query, (transport) => {
- infobox_callback2(transport, title);
- if (callback) callback(transport);
- });
-
- return false;
-}
-
-function infobox_callback2(transport, title) {
- let dialog = false;
-
- if (dijit.byId("infoBox")) {
- dialog = dijit.byId("infoBox");
- }
+ try {
+ const content = transport.responseText;
+
+ let dialog = dijit.byId("infoBox");
+
+ if (!dialog) {
+ dialog = new dijit.Dialog({
+ title: title,
+ id: 'infoBox',
+ style: "width: 600px",
+ onCancel: function () {
+ return true;
+ },
+ onExecute: function () {
+ return true;
+ },
+ onClose: function () {
+ return true;
+ },
+ content: content
+ });
+ } else {
+ dialog.attr('title', title);
+ dialog.attr('content', content);
+ }
- //console.log("infobox_callback2");
- notify('');
+ dialog.show();
- const content = transport.responseText;
+ notify("");
- if (!dialog) {
- dialog = new dijit.Dialog({
- title: title,
- id: 'infoBox',
- style: "width: 600px",
- onCancel: function() {
- return true;
- },
- onExecute: function() {
- return true;
- },
- onClose: function() {
- return true;
- },
- content: content});
- } else {
- dialog.attr('title', title);
- dialog.attr('content', content);
- }
-
- dialog.show();
+ if (callback) callback(transport);
+ } catch (e) {
+ exception_error(e);
+ }
+ });
- notify("");
+ return false;
}
function getInitParam(key) {