loleaflet/src/core/Socket.js | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit fe10c1d272043e3b64a148c681b4652676d613f5
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date: Sat Nov 19 18:03:21 2016 -0500
loleaflet: close open dialogs before showing close frame
Change-Id: I833ec51f47106dc42b7e9d2412f03256721b270d
Reviewed-on: https://gerrit.libreoffice.org/31005
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
Tested-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 7d802ae..41ddfb4 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -196,6 +196,13 @@ L.Socket = L.Class.extend({
msg = _('Server shutdown for maintenance');
}
+ // Close any open dialogs first.
+ if (vex.dialogID > 0) {
+ var id = vex.dialogID;
+ vex.dialogID = -1;
+ vex.close(id);
+ }
+
var options = $.extend({}, vex.defaultOptions, {
contentCSS: {'background':'rgba(0, 0, 0, 0)',
'font-size': 'xx-large',
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
