From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sun, 3 Nov 2024 12:57:58 +0000 (+0000)
Subject: Fixes duplicate spacer id in jsToolBar (#38915).
X-Git-Tag: 6.0.0~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e877c081ff80292e1e1e6bca42a458f38deae4e;p=redmine.git

Fixes duplicate spacer id in jsToolBar (#38915).

Patch by Yasu Saku (user:skys).



git-svn-id: https://svn.redmine.org/redmine/trunk@23192 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/assets/javascripts/jstoolbar/jstoolbar.js b/app/assets/javascripts/jstoolbar/jstoolbar.js
index 3353a7581..bae625c3b 100644
--- a/app/assets/javascripts/jstoolbar/jstoolbar.js
+++ b/app/assets/javascripts/jstoolbar/jstoolbar.js
@@ -140,15 +140,14 @@ jsButton.prototype.draw = function() {
   return button;
 }
 
-function jsSpace(id) {
-  this.id = id || null;
+function jsSpace(className) {
+  this.className = className || null;
   this.width = null;
 }
 jsSpace.prototype.draw = function() {
   var span = document.createElement('span');
-  if (this.id) span.id = this.id;
   span.appendChild(document.createTextNode(String.fromCharCode(160)));
-  span.className = 'jstSpacer';
+  span.className = 'jstSpacer' + (this.className ? ' ' + this.className : '');
   if (this.width) span.style.marginRight = this.width+'px';
 
   return span;