[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - 2 commits - loleaflet/main.js loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/main.js                |    4 +++-
 loleaflet/src/control/Control.js |    1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 5f9a11aebd6b10ed1d4ab5bf05d41823a89ec06a
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sun Aug 26 11:54:19 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Sep 12 20:03:38 2018 +0200

    loleaflet: remove unused corner control
    
    Change-Id: Iea7003a6542d704cdd8ec54e8e5f6b8fb3b275ad
    Reviewed-on: https://gerrit.libreoffice.org/60386
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.js b/loleaflet/src/control/Control.js
index 99f797560..b754e7a3a 100644
--- a/loleaflet/src/control/Control.js
+++ b/loleaflet/src/control/Control.js
@@ -129,7 +129,6 @@ L.Map.include({
 		}
 
 		createCorner('top', 'left');
-		createCorner('top', 'middle');
 		createCorner('top', 'right');
 		createCorner('bottom', 'left');
 		createCorner('bottom', 'right');
commit e1ea8b4d63f5be81d6c5ece688f386b9941a3445
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Sun Aug 26 11:52:50 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Sep 12 20:03:23 2018 +0200

    loleaflet: mobile: enable context menu
    
    Change-Id: If6d24d05cc59274b49059b9e05f91dcc0f6cdc6b
    Reviewed-on: https://gerrit.libreoffice.org/60384
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/main.js b/loleaflet/main.js
index bff5f3d3d..f639c5b3b 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -141,5 +141,7 @@ window.addEventListener('beforeunload', function () {
 	}
 });
 
-L.DomEvent.on(document, 'contextmenu', L.DomEvent.preventDefault);
+if (!L.Browser.mobile) {
+	L.DomEvent.on(document, 'contextmenu', L.DomEvent.preventDefault);
+}
 //require('./dist/toolbar/toolbar');