Merge branch 'master' of github.com:6pac/SlickGrid

6pac · Jun 30, 2023 · 3e261a4 · 3e261a4
2 parents c7a7aeb + b367209
commit 3e261a4
Show file tree

Hide file tree

Showing 112 changed files with 126 additions and 206 deletions.
diff --git a/controls/slick.gridmenu.js b/controls/slick.gridmenu.js
@@ -207,7 +207,7 @@
         _buttonElm.ariaLabel = 'Grid Menu';
 
         if (_options.gridMenu && _options.gridMenu.iconCssClass) {
-          _buttonElm.classList.add(_options.gridMenu.iconCssClass);
+          _buttonElm.classList.add(..._options.gridMenu.iconCssClass.split(' '));
         } else {
           const iconImageElm = document.createElement('img');
           iconImageElm.src = (_options.gridMenu && _options.gridMenu.iconImage) ? _options.gridMenu.iconImage : "../images/drag-handle.png";
@@ -344,7 +344,7 @@
         }
 
         if (item.cssClass) {
-          liElm.classList.add(item.cssClass);
+          liElm.classList.add(...item.cssClass.split(' '));
         }
 
         if (item.tooltip) {
@@ -357,7 +357,7 @@
         liElm.appendChild(iconElm);
 
         if (item.iconCssClass) {
-          iconElm.classList.add(item.iconCssClass);
+          iconElm.classList.add(...item.iconCssClass.split(' '));
         }
 
         if (item.iconImage) {
@@ -371,7 +371,7 @@
         liElm.appendChild(textElm);
 
         if (item.textCssClass) {
-          textElm.classList.add(item.textCssClass);
+          textElm.classList.add(...item.textCssClass.split(' '));
         }
 
         customMenuElm.appendChild(liElm);

diff --git a/dist/controls/slick.columnmenu.min.js b/dist/controls/slick.columnmenu.min.js
diff --git a/dist/controls/slick.columnmenu.min.js.map b/dist/controls/slick.columnmenu.min.js.map
diff --git a/dist/controls/slick.columnpicker - Copy.min.js b/dist/controls/slick.columnpicker - Copy.min.js