[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-3' - 2 commits - loleaflet/css loleaflet/src

Tamás Zolnai (via logerrit) logerrit at kemper.freedesktop.org
Sun May 10 15:18:31 UTC 2020


 loleaflet/css/loleaflet.css                 |    1 +
 loleaflet/src/layer/FormFieldButtonLayer.js |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 4dcba095ea794d24b59566731a33d3e7a088753b
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu May 7 15:14:13 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 17:18:26 2020 +0200

    MSForms: remove weird blue border dispalyed around the drop down button.
    
    Change-Id: Iddb696f10d9eb5364904021dd50431e11efc8dfb
    (cherry picked from commit 68017efb3caa801b733090f5b8085afc315ef529)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93890
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index b2dc2e8cb..227658acb 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -547,6 +547,7 @@ body {
 
 .form-field-button:hover, .form-field-button:focus {
 	background: #DDDDDD;
+	outline: 0;
 }
 
 .form-field-button-image {
commit 4cf172c1414c675daa3c7ec647f05deda5875a78
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu May 7 14:21:24 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 17:18:13 2020 +0200

    MSForms: stop propagation of mouse events for the drop down button.
    
    Change-Id: Id63056f1aa39cadfc62021c5220d301f7ea26af8
    (cherry picked from commit c7c690c4e805aaf5ed40b0e7f30929d26ed59327)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93889
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/layer/FormFieldButtonLayer.js b/loleaflet/src/layer/FormFieldButtonLayer.js
index 33c6b561c..0acaabce5 100644
--- a/loleaflet/src/layer/FormFieldButtonLayer.js
+++ b/loleaflet/src/layer/FormFieldButtonLayer.js
@@ -90,6 +90,10 @@ L.FormFieldButton = L.Layer.extend({
 		image.src = 'images/unfold.svg';
 
 		button.addEventListener('click', this._onClickDropDown);
+
+		// Stop propagation to the main document
+		button.addEventListener('mouseup', function(event) {event.stopPropagation();});
+		button.addEventListener('mousedown', function(event) {event.stopPropagation();});
 	},
 
 	_buildDropDownList: function(framePos, frameWidth, frameHeight) {


More information about the Libreoffice-commits mailing list