jqtree 1.6.2 → 1.6.3

package/src/test/jqTree/options.test.ts

@@ -1,5 +1,5 @@
 import getGiven from "givens";
-import { screen } from "@testing-library/dom";
+import { screen, waitFor } from "@testing-library/dom";
 import { rest } from "msw";
 import { setupServer } from "msw/node";
 import "../../tree.jquery";
@@ -8,17 +8,25 @@ import { titleSpan, togglerLink } from "../support/testUtil";
 
 const context = describe;
 
+const server = setupServer();
+
+beforeAll(() => server.listen());
+
 beforeEach(() => {
     $("body").append('<div id="tree1"></div>');
 });
 
 afterEach(() => {
+    server.resetHandlers();
+
     const $tree = $("#tree1");
     $tree.tree("destroy");
     $tree.remove();
     localStorage.clear();
 });
 
+afterAll(() => server.close());
+
 describe("autoEscape", () => {
     interface Vars {
         autoEscape: boolean;
@@ -186,10 +194,8 @@ describe("dataUrl", () => {
         },
     ];
 
-    let server: ReturnType<typeof setupServer> | null = null;
-
-    beforeAll(() => {
-        server = setupServer(
+    beforeEach(() => {
+        server.use(
             rest.get("/tree/", (request, response, ctx) => {
                 const nodeName = request.headers.get("node");
                 const data = nodeName ? [nodeName] : exampleData;
@@ -197,11 +203,6 @@ describe("dataUrl", () => {
                 return response(ctx.status(200), ctx.json(data));
             })
         );
-        server.listen();
-    });
-
-    afterAll(() => {
-        server?.close();
     });
 
     interface Vars {
@@ -347,31 +348,28 @@ describe("onLoadFailed", () => {
     given("$tree", () => $("#tree1"));
 
     context("when the loading fails", () => {
-        let server: ReturnType<typeof setupServer> | null = null;
-
-        beforeAll(() => {
-            server = setupServer(
+        beforeEach(() => {
+            server.use(
                 rest.get("/tree/", (_request, response, ctx) =>
                     response(ctx.status(500), ctx.body("Internal server error"))
                 )
             );
-            server.listen();
         });
 
-        afterAll(() => {
-            server?.close();
-        });
+        it("calls onLoadFailed", async () => {
+            const onLoadFailed = jest.fn();
+
+            given.$tree.tree({
+                dataUrl: "/tree/",
+                onLoadFailed,
+            });
 
-        it("calls onLoadFailed", () =>
-            new Promise<void>((done) => {
-                given.$tree.tree({
-                    dataUrl: "/tree/",
-                    onLoadFailed: (jqXHR) => {
-                        expect(jqXHR.status).toBe(500);
-                        done();
-                    },
-                });
-            }));
+            await waitFor(() => {
+                expect(onLoadFailed).toHaveBeenCalledWith(
+                    expect.objectContaining({ status: 500 })
+                );
+            });
+        });
     });
 });
 

package/src/tree.jquery.d.ts

@@ -62,7 +62,7 @@ interface IJQTreeOptions {
     onGetStateFromStorage?: () => string;
     onSetStateFromStorage?: (data: string) => void;
     openedIcon?: string | Element;
-    openFolderDelay?: number;
+    openFolderDelay?: number | false;
     rtl?: boolean;
     selectable?: boolean;
     saveState?: boolean | string;

package/tree.jquery.debug.js

@@ -1,7 +1,7 @@
 /*
-JqTree 1.6.2
+JqTree 1.6.3
 
-Copyright 2021 Marco Braak
+Copyright 2022 Marco Braak
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -101,32 +101,31 @@ var jqtree = (function (exports) {
       throw new TypeError("Super expression must either be null or a function");
     }
 
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        writable: true,
+        configurable: true
+      }
+    });
     Object.defineProperty(subClass, "prototype", {
-      value: Object.create(superClass && superClass.prototype, {
-        constructor: {
-          value: subClass,
-          writable: true,
-          configurable: true
-        }
-      }),
       writable: false
     });
     if (superClass) _setPrototypeOf(subClass, superClass);
   }
 
   function _getPrototypeOf(o) {
-    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+    _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) {
       return o.__proto__ || Object.getPrototypeOf(o);
     };
     return _getPrototypeOf(o);
   }
 
   function _setPrototypeOf(o, p) {
-    _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) {
       o.__proto__ = p;
       return o;
     };
-
     return _setPrototypeOf(o, p);
   }
 
@@ -191,7 +190,7 @@ var jqtree = (function (exports) {
 
   function _get() {
     if (typeof Reflect !== "undefined" && Reflect.get) {
-      _get = Reflect.get;
+      _get = Reflect.get.bind();
     } else {
       _get = function _get(target, property, receiver) {
         var base = _superPropBase(target, property);
@@ -1346,7 +1345,11 @@ var jqtree = (function (exports) {
         };
 
         this.stopOpenFolderTimer();
-        this.openFolderTimer = window.setTimeout(openFolder, this.treeWidget.options.openFolderDelay);
+        var openFolderDelay = this.treeWidget.options.openFolderDelay;
+
+        if (openFolderDelay !== false) {
+          this.openFolderTimer = window.setTimeout(openFolder, openFolderDelay);
+        }
       }
     }, {
       key: "stopOpenFolderTimer",