[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Jan Holesovsky (via logerrit)]

 loleaflet/css/loleaflet.css              |    2 +-
 loleaflet/src/layer/marker/Annotation.js |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 1040353fde3baf525be79964fded6dac4b459780
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jan 18 17:14:14 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Nov 13 15:36:47 2019 +0100

    More reliable way of theming the comment buttons.
    
    Change-Id: I9c8e81a494733ec343b42596a19b1e90fa2b00d5
    Reviewed-on: https://gerrit.libreoffice.org/82593
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 3ab5e2837..3eafe0f68 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -341,7 +341,7 @@ body {
 	width: 20px;
 }
 
-.loleaflet-controls {
+.annotation-button {
 	margin-right: 10px;
 }
 
diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index d9ccfdbf9..ed12b0003 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -164,8 +164,9 @@ L.Annotation = L.Layer.extend({
 		}
 	},
 
-	_createButton: function(container, value, handler) {
-		var button = L.DomUtil.create('input', 'loleaflet-controls', container);
+	_createButton: function(container, id, value, handler) {
+		var button = L.DomUtil.create('input', 'annotation-button', container);
+		button.id = id;
 		button.type = 'button';
 		button.value = value;
 		L.DomEvent.on(button, 'mousedown', L.DomEvent.preventDefault);
@@ -246,11 +247,11 @@ L.Annotation = L.Layer.extend({
 		buttons = L.DomUtil.create(tagDiv, empty, this._nodeModify);
 		L.DomEvent.on(this._nodeModifyText, 'blur', this._onLostFocus, this);
 		L.DomEvent.on(this._nodeReplyText, 'blur', this._onLostFocusReply, this);
-		this._createButton(buttons, _('Save'), this._onSaveComment);
-		this._createButton(buttons, cancel, this._onCancelClick);
+		this._createButton(buttons, 'annotation-cancel', cancel, this._onCancelClick);
+		this._createButton(buttons, 'annotation-save', _('Save'), this._onSaveComment);
 		buttons = L.DomUtil.create(tagDiv, empty, this._nodeReply);
-		this._createButton(buttons, _('Reply'), this._onReplyClick);
-		this._createButton(buttons, cancel, this._onCancelClick);
+		this._createButton(buttons, 'annotation-cancel', cancel, this._onCancelClick);
+		this._createButton(buttons, 'annotation-reply', _('Reply'), this._onReplyClick);
 		L.DomEvent.disableScrollPropagation(this._container);
 
 		this._container.style.visibility = 'hidden';