[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/loleaflet.css               |    1 +
 loleaflet/src/control/Control.LokDialog.js |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5d190a3a363aacbc6eee4ac218fed7db956695bf
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Sat Dec 23 17:57:00 2017 +0530

    loleaflet: '/' or backspace launches browser-specific actions
    
    Make the canvas contentEditable which prevents such actions from being
    invoked. Other alternative would be to add a dummy text field but this
    seems to do the work as well.
    
    Change-Id: I8d39f06b02959459e0beeebad2eefcd8e9e00d9d
    Reviewed-on: https://gerrit.libreoffice.org/47069
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 7c054c33..38d9383e 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -349,5 +349,6 @@ body {
 }
 
 .lokdialog_canvas {
+        cursor: default;
         display: block; /* required to remove all borders around canvas element */
 }
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 0f3dc49f..4abf350b 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -187,6 +187,7 @@ L.Control.LokDialog = L.Control.extend({
 		dialogCanvas.width = width;
 		dialogCanvas.height = height;
 		dialogCanvas.tabIndex = '0';
+		dialogCanvas.contentEditable = true;
 		dialogCanvas.id = strDlgId + '-canvas';
 
 		var that = this;