[Libreoffice-commits] online.git: loleaflet/admin

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 8 11:51:50 UTC 2020


 loleaflet/admin/src/AdminSocketOverview.js |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 971ed41c0ddfcf5ed193435d73b819e09dd3c338
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Jan 8 11:50:19 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Wed Jan 8 11:51:10 2020 +0000

    admin: Kill menu uses href="#" so disable vex auto-close on popstate
    
    Change-Id: Icc94fc0dae70718700b709b81785162254af2ed4

diff --git a/loleaflet/admin/src/AdminSocketOverview.js b/loleaflet/admin/src/AdminSocketOverview.js
index 9c61089cc..029b36997 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -82,6 +82,9 @@ var AdminSocketOverview = AdminSocketBase.extend({
 			});
 		}, 1000);
 
+		// Dialog uses <a href='#' - which triggers popstate
+		vex.defaultOptions.closeAllOnPopState = false;
+
 		// Allow table rows to have a context menu for terminating sessions
 		$('body').on('contextmenu', '#docview tr', function(ev) {
 			$('#rowContextMenu').css({


More information about the Libreoffice-commits mailing list