Skip to content

Commit 3e261a4

Browse files
committed
Merge branch 'master' of github.com:6pac/SlickGrid
2 parents c7a7aeb + b367209 commit 3e261a4

File tree

112 files changed

+126
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+126
-206
lines changed

controls/slick.gridmenu.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
_buttonElm.ariaLabel = 'Grid Menu';
208208

209209
if (_options.gridMenu && _options.gridMenu.iconCssClass) {
210-
_buttonElm.classList.add(_options.gridMenu.iconCssClass);
210+
_buttonElm.classList.add(..._options.gridMenu.iconCssClass.split(' '));
211211
} else {
212212
const iconImageElm = document.createElement('img');
213213
iconImageElm.src = (_options.gridMenu && _options.gridMenu.iconImage) ? _options.gridMenu.iconImage : "../images/drag-handle.png";
@@ -344,7 +344,7 @@
344344
}
345345

346346
if (item.cssClass) {
347-
liElm.classList.add(item.cssClass);
347+
liElm.classList.add(...item.cssClass.split(' '));
348348
}
349349

350350
if (item.tooltip) {
@@ -357,7 +357,7 @@
357357
liElm.appendChild(iconElm);
358358

359359
if (item.iconCssClass) {
360-
iconElm.classList.add(item.iconCssClass);
360+
iconElm.classList.add(...item.iconCssClass.split(' '));
361361
}
362362

363363
if (item.iconImage) {
@@ -371,7 +371,7 @@
371371
liElm.appendChild(textElm);
372372

373373
if (item.textCssClass) {
374-
textElm.classList.add(item.textCssClass);
374+
textElm.classList.add(...item.textCssClass.split(' '));
375375
}
376376

377377
customMenuElm.appendChild(liElm);

dist/controls/slick.columnmenu.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/controls/slick.columnmenu.min.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/controls/slick.columnpicker - Copy.min.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)