loleaflet/src/control/Control.Menubar.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit af02723f90fa22d7a7673f443495ff8abcd839d6
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon May 30 00:43:04 2016 +0200
loleaflet: bccu#1856 disable View - Full screen on Edge, too
(cherry picked from commit a4c8ceb1ac766cfb3a6b1cd5e044d43a5d145a7d)
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d3d04d3..eeaebd8 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -191,11 +191,12 @@ L.Control.Menubar = L.Control.extend({
var ua = window.navigator.userAgent;
var msie = ua.indexOf('MSIE '); // IE 10 or older
var trident = ua.indexOf('Trident/'); // IE 11
+ var edge = ua.indexOf('Edge/'); // Microsoft Edge
$(items).each(function() {
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
- if (id === 'fullscreen' && (msie > 0 || trident > 0)) {
// Full screen works weirdly on IE 11
+ if (id === 'fullscreen' && (msie > 0 || trident > 0 ||
edge > 0)) { // Full screen works weirdly on IE 11 and on Edge
$(aItem).addClass('disabled');
var index =
self.options.allowedViewModeActions.indexOf('fullscreen');
if (index > 0) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
