Bugfix/example issues fixes (#772)

* fix: found a few small issues while testing examples with jQuery CDN
6pac · May 13, 2023 · de88e68 · de88e68
1 parent aa1d1c8
commit de88e68
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/controls/slick.pager.js b/controls/slick.pager.js
@@ -108,6 +108,7 @@
     function constructPagerUI() {
       // the container might be a string, a jQuery object or a native element
       const container = getContainerElement(selectorOrElm);
+      if (!container || (container.jquery && !container[0])) return;
 
       const navElm = document.createElement('span');
       navElm.className = 'slick-pager-nav';
@@ -195,6 +196,7 @@
     }
 
     function updatePager(pagingInfo) {
+      if (!container || (container.jquery && !container[0])) return;
       let state = getNavState();
 
       // remove disabled class on all icons

diff --git a/examples/example-grid-menu.html b/examples/example-grid-menu.html
@@ -247,7 +247,7 @@ <h2>View Source:</h2>
   };
 
   // show 1st column with font-awesome hashtag icon
-  var columns = [{ id: 'id', field: 'id', name: '<i class="fa fa-hashtag"></i>', width: 40, excludeFromGridMenu: true }];
+  var columns = [{ id: 'id', field: 'id', name: '<i class="fa fa-info"></i>', width: 40, excludeFromGridMenu: true }];
   var columnFilters = {};
   var sortcol = "id";
   var sortdir = 1;

diff --git a/examples/example10-async-post-render.html b/examples/example10-async-post-render.html
@@ -61,7 +61,8 @@ <h2>View Source:</h2>
 
 <script src="../lib/firebugx.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+<script src="https://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
 <!-- nb: sparkline 2.x will cause a memory leak in the current architecture, so we use sparkline 1.x and jquery-migrate -->
 <script src="../lib/jquery.sparkline.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/sortablejs/Sortable.min.js"></script>

diff --git a/slick.grid.js b/slick.grid.js
@@ -2977,7 +2977,8 @@ if (typeof Slick === "undefined") {
       _headers.forEach(function (header) {
         for (let i = 0; i < header.children.length; i++, columnIndex++) {
           const h = header.children[i];
-          const width = columns[columnIndex].width - headerColumnWidthDiff;
+          const col = columns[columnIndex] || {};
+          const width = (col.width || 0) - headerColumnWidthDiff;
           if (utils.width(h) !== width) {
             utils.width(h, width);
           }

diff --git a/slick.interactions.js b/slick.interactions.js
@@ -39,7 +39,7 @@
     };
 
     if (containerElement) {
-      containerElement.addEventListener('mousedown', userPressed);
+      containerElement.addEventListener('mousedown', userPressed, Slick.Utils.enablePassiveWhenSupported());
       containerElement.addEventListener('touchstart', userPressed, Slick.Utils.enablePassiveWhenSupported());
     }
 
@@ -51,7 +51,7 @@
 
     function destroy() {
       if (containerElement) {
-        containerElement.removeEventListener('mousedown', userPressed);
+        containerElement.removeEventListener('mousedown', userPressed, Slick.Utils.enablePassiveWhenSupported());
         containerElement.removeEventListener('touchstart', userPressed, Slick.Utils.enablePassiveWhenSupported());
       }
     }
@@ -130,13 +130,13 @@
     let { element, onMouseWheel } = options;
 
     function destroy() {
-      element.removeEventListener('wheel', wheelHandler, Slick.Utils.enablePassiveWhenSupported());
-      element.removeEventListener('mousewheel', wheelHandler, Slick.Utils.enablePassiveWhenSupported());
+      element.removeEventListener('wheel', wheelHandler);
+      element.removeEventListener('mousewheel', wheelHandler);
     }
 
     function init() {
-      element.addEventListener('wheel', wheelHandler, Slick.Utils.enablePassiveWhenSupported());
-      element.addEventListener('mousewheel', wheelHandler, Slick.Utils.enablePassiveWhenSupported());
+      element.addEventListener('wheel', wheelHandler);
+      element.addEventListener('mousewheel', wheelHandler);
     }
 
     // copy over the same event handler code used in jquery.mousewheel