[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - loleaflet/src

[Henry Castro]

 loleaflet/src/control/Control.ColumnHeader.js |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ad3eb589b91f483078a18c155a78281f036d9375
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Jun 6 17:50:39 2017 -0400

    loleaflet: prevent default context menu of the corner column header
    
    Change-Id: I27d78e0ef9946776e1311da12ac0116a16a861f7
    (cherry picked from commit 5ab255c957f679caa81277c91035daad9434ccd1)
    Reviewed-on: https://gerrit.libreoffice.org/48962
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/src/control/Control.ColumnHeader.js b/loleaflet/src/control/Control.ColumnHeader.js
index b79678fc..c63a0c83 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -23,6 +23,7 @@ L.Control.ColumnHeader = L.Control.Header.extend({
 		this._map.on('updatecurrentheader', this._onUpdateCurrentColumn, this);
 		var rowColumnFrame = L.DomUtil.get('spreadsheet-row-column-frame');
 		var cornerHeader = L.DomUtil.create('div', 'spreadsheet-header-corner', rowColumnFrame);
+		L.DomEvent.on(cornerHeader, 'contextmenu', L.DomEvent.preventDefault);
 		L.DomEvent.addListener(cornerHeader, 'click', this._onCornerHeaderClick, this);
 		var headersContainer = L.DomUtil.create('div', 'spreadsheet-header-columns-container', rowColumnFrame);
 		this._columns = L.DomUtil.create('div', 'spreadsheet-header-columns', headersContainer);