chore: fix some build issues after master branch merge

6pac · Jul 8, 2023 · c34c948 · c34c948
1 parent eef9f9c
commit c34c948
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/examples/example-row-detail-selection-and-move.html b/examples/example-row-detail-selection-and-move.html
@@ -152,7 +152,7 @@ <h3>Selected Titles:</h3>
 
     var columns = [
       { id: "sel", name: "#", field: "num", behavior: "select", cssClass: "cell-selection", width: 40, resizable: false, selectable: false },
-      { id: "title", name: "Title", field: "title", width: 100, cssClass: "cell-title", sortable: true },
+      { id: "title", name: "Title", field: "title", width: 110, cssClass: "cell-title", sortable: true },
       { id: "duration", name: "Duration", field: "duration", width: 75, sortable: true },
       { id: "%", name: "% Complete", field: "percentComplete", width: 95, resizable: false, formatter: Slick.Formatters.PercentCompleteBar, sortable: true },
       { id: "start", name: "Start", field: "start", minWidth: 60 },
@@ -230,7 +230,11 @@ <h3>Selected Titles:</h3>
 
     document.addEventListener("DOMContentLoaded", function() {
       // prepare the data
+      for (var i = 0; i < 1000; i++) {
         data[i] = new DataItem(i);
+      }
+      dataView = new Slick.Data.DataView();
+
       // create the row detail plugin
       detailViewPlugin = new Slick.Plugins.RowDetailView({
         cssClass: "detailView-toggle",

diff --git a/src/controls/slick.gridmenu.js b/src/controls/slick.gridmenu.js
@@ -202,20 +202,12 @@ export function SlickGridMenu(columns, grid, options) {
         _buttonElm.className = 'slick-gridmenu-button';
         _buttonElm.ariaLabel = 'Grid Menu';
 
-        if (_options.gridMenu && _options.gridMenu.iconImage) {
-          const iconImageElm = document.createElement('img');
-          iconImageElm.src = _options.gridMenu.iconImage;
-          _buttonElm.appendChild(iconImageElm);
-        } else if (_options.gridMenu && _options.gridMenu.iconCssClass) {
+        if (_options.gridMenu && _options.gridMenu.iconCssClass) {
           _buttonElm.classList.add(..._options.gridMenu.iconCssClass.split(' '));
         } else {
           const iconImageElm = document.createElement('img');
-          iconImageElm.src = _options.gridMenu.iconImage;
+          iconImageElm.src = (_options.gridMenu && _options.gridMenu.iconImage) ? _options.gridMenu.iconImage : "../images/drag-handle.png";
           _buttonElm.appendChild(iconImageElm);
-        } else if (_options.gridMenu && _options.gridMenu.iconCssClass) {
-          _buttonElm.classList.add(..._options.gridMenu.iconCssClass.split(' '));
-        } else {
-          _buttonElm.classList.add('sgi', 'sgi-menu'); // default icon when nothing provided
         }
         if (options.iconCssClass) {
           _buttonElm.classList.add(...options.iconCssClass.split(' '));