From 16ef93b1f968fcb3e066c9be844c50fd43bb75ba Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sat, 27 Nov 2021 10:06:57 +0200
Subject: [PATCH] missing .js file from Nathans merge-edit commit

---
 calendar/js/app.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index a0aee80875..e8e6123c08 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2203,21 +2203,29 @@ var CalendarApp = /** @class */ (function (_super) {
                 nm.controller._selectionMgr.selectAll(true);
             }
             if (action && selected) {
-                action.execute(selected);
+                _super.prototype.merge.call(this, action, selected);
             }
         }
         else {
             // Set the hidden inputs to the current time span & submit
             widget.getRoot().getWidgetById('first').set_value(app.calendar.state.first);
             widget.getRoot().getWidgetById('last').set_value(app.calendar.state.last);
-            if (widget.getRoot().getArrayMgr('content').getEntry('collabora_enabled')) {
-                widget.getInstanceManager().submit();
-            }
-            else {
-                widget.getInstanceManager().postSubmit();
-                window.setTimeout(function () { widget.set_value(''); }, 100);
-            }
+            var vars = {
+                menuaction: 'calendar.calendar_merge.merge_entries',
+                document: widget.getValue(),
+                merge: 'calendar_merge',
+                pdf: false,
+                select_all: false,
+                id: JSON.stringify({
+                    first: app.calendar.state.first,
+                    last: app.calendar.state.last,
+                    date: app.calendar.state.first,
+                    view: app.calendar.state.view
+                })
+            };
+            egw.open_link(egw.link('/index.php', vars), '_blank');
         }
+        widget.set_value('');
         return false;
     };
     /**