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

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js          |    2 +-
 loleaflet/src/control/Signing.js |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4420d4f033fa6fa14035f357b6ab9c767e39b9da
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Dec 9 23:13:29 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Dec 9 23:16:22 2018 +0100

    id of Close button on Document signing bar should be unique
    
    Change-Id: Ib4f9d044d8e943de27f36029ce54100d29553604
    (cherry picked from commit d9dee9793bdb5b6a2bec59098eda60c1f593469f)

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 851b3c948..a25a87b0a 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1119,7 +1119,7 @@ function initNormalToolbar(toolItems) {
 				{type: 'spacer'},
 				{type: 'button',  id: 'logout',  caption: _('Logout'), img: '', hint: _('Logout')},
 				{type: 'button',  id: 'login',  caption: _('Login'), img: '', hint: _('Login')},
-				{type: 'button',  id: 'close', img: 'closetoolbar', hint: _('Close')},
+				{type: 'button',  id: 'close-document-signing-bar', img: 'closetoolbar', hint: _('Close')},
 			],
 			onClick: function (e) {
 				onClick(e, e.target);
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 52cb61ca2..fa1e796ff 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -435,7 +435,7 @@ L.Map.include({
 		}
 	},
 	handleSigningClickEvent: function(id, item) {
-		if (id === 'close') {
+		if (id === 'close-document-signing-bar') {
 			this.hideSignDocument();
 		}
 		else if (id === 'login') {