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

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Sat Aug 15 08:59:32 UTC 2020


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

New commits:
commit 73227645c0d62d69c59aa0bb552ccdc906064b82
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Fri Aug 14 17:54:08 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Sat Aug 15 10:59:14 2020 +0200

    Remove parameters from uno commands when creating image names.
    
    Change-Id: I26b4a6793e03b178382c04c91bd07b29182176ac
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100760
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index d9fd75926..895af0561 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1606,6 +1606,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		var prefixLength = '.uno:'.length;
 		if (name.substr(0, prefixLength) == '.uno:')
 			cleanName = name.substr(prefixLength);
+		cleanName = cleanName.replace(/\?.*$/,''); // remove potential parameters
 		cleanName = encodeURIComponent(cleanName).replace(/\%/g, '');
 		return L.LOUtil.getImageURL('lc_' + cleanName.toLowerCase() + '.svg');
 	},


More information about the Libreoffice-commits mailing list