diff options
| author | Andras Timar <andras.timar@collabora.com> | 2016-05-30 00:43:04 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-05-30 00:43:53 +0200 |
| commit | af02723f90fa22d7a7673f443495ff8abcd839d6 (patch) | |
| tree | 25b601389f2d2c91c186c2f5b37c5b2e0207ce6d | |
| parent | ae8d7292ddaf936b237f9a66887d34b28256013e (diff) | |
loleaflet: bccu#1856 disable View - Full screen on Edge, too1.6.8-3
(cherry picked from commit a4c8ceb1ac766cfb3a6b1cd5e044d43a5d145a7d)
| -rw-r--r-- | loleaflet/src/control/Control.Menubar.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index d3d04d351..eeaebd85a 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) { |