jqtree 1.6.1 → 1.6.2

package/.eslintrc

@@ -34,6 +34,7 @@
         "jest/no-hooks": "off",
         "jest/no-identical-title": "off",
         "jest/prefer-strict-equal": "off",
+        "jest/require-hook": "off",
         "jest/require-top-level-describe": "off"
     },
     "parserOptions": {

package/_config.yml

@@ -11,7 +11,7 @@ collections:
     examples:
         output: true
 
-jqtree_version: 1.6.1
+jqtree_version: 1.6.2
 
 # Build settings
 markdown: kramdown

package/_entries/10_changelog.md

@@ -3,6 +3,11 @@ title: Changelog
 name: changelog
 ---
 
+#### 1.6.2 (december 15 2021)
+
+-   Issue #662: fix left alignment for option buttonLeft: false (thanks to Odungern)
+-   Issue #669: restore focus after load on demand (thanks to Jaccoky)
+
 #### 1.6.1 (june 24 2021)
 
 -   Issues #652 and #655: add filter example

package/_layouts/base.html

@@ -13,28 +13,6 @@
         <link rel="stylesheet" href="{{ site.baseurl }}/jqtree.css" />
         <link rel="stylesheet" href="{{ site.baseurl }}/static/monokai.css" />
         <link rel="stylesheet" href="{{ site.baseurl }}/static/bower_components/fontawesome/css/all.min.css" />
-
-        <script>
-            ;(function(i, s, o, g, r, a, m) {
-                i["GoogleAnalyticsObject"] = r
-                ;(i[r] =
-                    i[r] ||
-                    function() {
-                        ;(i[r].q = i[r].q || []).push(arguments)
-                    }),
-                    (i[r].l = 1 * new Date())
-                ;(a = s.createElement(o)), (m = s.getElementsByTagName(o)[0])
-                a.async = 1
-                a.src = g
-                m.parentNode.insertBefore(a, m)
-            })(window, document, "script", "//www.google-analytics.com/analytics.js", "ga")
-
-            ga("create", "UA-33742133-1", "auto")
-            ga("require", "displayfeatures")
-            ga("require", "linkid", "linkid.js")
-            ga("send", "pageview")
-        </script>
-
         {% if page.css %}
         <link rel="stylesheet" href="{{ site.baseurl }}/static/{{ page.css }}" />
         {% endif %}

package/babel.config.json

@@ -0,0 +1,11 @@
+{
+    "presets": ["@babel/preset-typescript", "@babel/preset-env"],
+    "env": {
+        "test": {
+            "presets": [
+                "@babel/preset-typescript",
+                ["@babel/preset-env", { "targets": { "node": "current" } }]
+            ]
+        }
+    }
+}

package/babel.coverage.config.json

@@ -0,0 +1,4 @@
+{
+    "presets": ["@babel/preset-typescript", "@babel/preset-env"],
+    "plugins": ["istanbul"]
+}

package/bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jqTree",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "main": ["jqtree.css", "jqtree-circle.png", "tree.jquery.js"],
     "dependencies": {
         "jquery": ">=1.9"

package/jest-browser.config.js

@@ -8,9 +8,6 @@ module.exports = {
     preset: "jest-playwright-preset",
     testRegex: "\\/src\\/playwright\\/.*\\.test\\.ts",
     setupFilesAfterEnv: ["expect-playwright", "givens/setup.js"],
-    transform: {
-        "^.+\\.ts$": "ts-jest",
-    },
     coveragePathIgnorePatterns: [
         "<rootDir>/node_modules/",
         "<rootDir>/src/playwright/",

package/jest-jsdom.config.js

@@ -5,11 +5,10 @@ module.exports = {
         "<rootDir>/_site/",
         "<rootDir>/static/",
     ],
-    preset: "ts-jest",
     setupFilesAfterEnv: [
         "<rootDir>/src/test/support/setupTests.ts",
         "givens/setup.js",
-        "jest-extended",
+        "jest-extended/all",
     ],
     testEnvironment: "jsdom",
     testRegex: "\\/src\\/test\\/.*\\.test\\.ts",

package/jqtree.css

@@ -60,10 +60,13 @@ ul.jqtree-tree {
     ul.jqtree-tree .jqtree-title {
         color: #1c4257;
         vertical-align: middle;
+    }
+
+    ul.jqtree-tree .jqtree-title-button-left {
         margin-left: 1.5em;
     }
 
-    ul.jqtree-tree .jqtree-title.jqtree-title-folder {
+    ul.jqtree-tree .jqtree-title-button-left.jqtree-title-folder {
             margin-left: 0;
         }
 

package/jqtree.postcss

@@ -59,6 +59,9 @@ ul.jqtree-tree {
     .jqtree-title {
         color: #1c4257;
         vertical-align: middle;
+    }
+
+    .jqtree-title-button-left {
         margin-left: 1.5em;
 
         &.jqtree-title-folder {

package/lib/dataLoader.js

@@ -1,102 +1,150 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var DataLoader = /*#__PURE__*/function () {
+  function DataLoader(treeWidget) {
+    _classCallCheck(this, DataLoader);
+
+    _defineProperty(this, "treeWidget", void 0);
+
+    this.treeWidget = treeWidget;
+  }
+
+  _createClass(DataLoader, [{
+    key: "loadFromUrl",
+    value: function loadFromUrl(urlInfo, parentNode, onFinished) {
+      var _this = this;
+
+      if (!urlInfo) {
+        return;
+      }
+
+      var $el = this.getDomElement(parentNode);
+      this.addLoadingClass($el);
+      this.notifyLoading(true, parentNode, $el);
+
+      var stopLoading = function stopLoading() {
+        _this.removeLoadingClass($el);
+
+        _this.notifyLoading(false, parentNode, $el);
+      };
+
+      var handleSuccess = function handleSuccess(data) {
+        stopLoading();
+
+        _this.treeWidget.loadData(_this.parseData(data), parentNode);
+
+        if (onFinished && typeof onFinished === "function") {
+          onFinished();
         }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-exports.__esModule = true;
-var DataLoader = /** @class */ (function () {
-    function DataLoader(treeWidget) {
-        this.treeWidget = treeWidget;
-    }
-    DataLoader.prototype.loadFromUrl = function (urlInfo, parentNode, onFinished) {
-        var _this = this;
-        if (!urlInfo) {
-            return;
-        }
-        var $el = this.getDomElement(parentNode);
-        this.addLoadingClass($el);
-        this.notifyLoading(true, parentNode, $el);
-        var stopLoading = function () {
-            _this.removeLoadingClass($el);
-            _this.notifyLoading(false, parentNode, $el);
-        };
-        var handleSuccess = function (data) {
-            stopLoading();
-            _this.treeWidget.loadData(_this.parseData(data), parentNode);
-            if (onFinished && typeof onFinished === "function") {
-                onFinished();
-            }
-        };
-        var handleError = function (jqXHR) {
-            stopLoading();
-            if (_this.treeWidget.options.onLoadFailed) {
-                _this.treeWidget.options.onLoadFailed(jqXHR);
-            }
-        };
-        this.submitRequest(urlInfo, handleSuccess, handleError);
-    };
-    DataLoader.prototype.addLoadingClass = function ($el) {
-        if ($el) {
-            $el.addClass("jqtree-loading");
-        }
-    };
-    DataLoader.prototype.removeLoadingClass = function ($el) {
-        if ($el) {
-            $el.removeClass("jqtree-loading");
-        }
-    };
-    DataLoader.prototype.getDomElement = function (parentNode) {
-        if (parentNode) {
-            return jQuery(parentNode.element);
-        }
-        else {
-            return this.treeWidget.element;
-        }
-    };
-    DataLoader.prototype.notifyLoading = function (isLoading, node, $el) {
-        if (this.treeWidget.options.onLoading) {
-            this.treeWidget.options.onLoading(isLoading, node, $el);
-        }
-        this.treeWidget._triggerEvent("tree.loading_data", {
-            isLoading: isLoading,
-            node: node,
-            $el: $el
-        });
-    };
-    DataLoader.prototype.submitRequest = function (urlInfoInput, handleSuccess, handleError) {
-        var _a;
-        var urlInfo = typeof urlInfoInput === "string"
-            ? { url: urlInfoInput }
-            : urlInfoInput;
-        var ajaxSettings = __assign({ method: "GET", cache: false, dataType: "json", success: handleSuccess, error: handleError }, urlInfo);
-        ajaxSettings.method = ((_a = ajaxSettings.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || "GET";
-        void jQuery.ajax(ajaxSettings);
-    };
-    DataLoader.prototype.parseData = function (data) {
-        var dataFilter = this.treeWidget.options.dataFilter;
-        var getParsedData = function () {
-            if (typeof data === "string") {
-                return JSON.parse(data);
-            }
-            else {
-                return data;
-            }
-        };
-        var parsedData = getParsedData();
-        if (dataFilter) {
-            return dataFilter(parsedData);
+      };
+
+      var handleError = function handleError(jqXHR) {
+        stopLoading();
+
+        if (_this.treeWidget.options.onLoadFailed) {
+          _this.treeWidget.options.onLoadFailed(jqXHR);
         }
-        else {
-            return parsedData;
+      };
+
+      this.submitRequest(urlInfo, handleSuccess, handleError);
+    }
+  }, {
+    key: "addLoadingClass",
+    value: function addLoadingClass($el) {
+      if ($el) {
+        $el.addClass("jqtree-loading");
+      }
+    }
+  }, {
+    key: "removeLoadingClass",
+    value: function removeLoadingClass($el) {
+      if ($el) {
+        $el.removeClass("jqtree-loading");
+      }
+    }
+  }, {
+    key: "getDomElement",
+    value: function getDomElement(parentNode) {
+      if (parentNode) {
+        return jQuery(parentNode.element);
+      } else {
+        return this.treeWidget.element;
+      }
+    }
+  }, {
+    key: "notifyLoading",
+    value: function notifyLoading(isLoading, node, $el) {
+      if (this.treeWidget.options.onLoading) {
+        this.treeWidget.options.onLoading(isLoading, node, $el);
+      }
+
+      this.treeWidget._triggerEvent("tree.loading_data", {
+        isLoading: isLoading,
+        node: node,
+        $el: $el
+      });
+    }
+  }, {
+    key: "submitRequest",
+    value: function submitRequest(urlInfoInput, handleSuccess, handleError) {
+      var _ajaxSettings$method;
+
+      var urlInfo = typeof urlInfoInput === "string" ? {
+        url: urlInfoInput
+      } : urlInfoInput;
+
+      var ajaxSettings = _objectSpread({
+        method: "GET",
+        cache: false,
+        dataType: "json",
+        success: handleSuccess,
+        error: handleError
+      }, urlInfo);
+
+      ajaxSettings.method = ((_ajaxSettings$method = ajaxSettings.method) === null || _ajaxSettings$method === void 0 ? void 0 : _ajaxSettings$method.toUpperCase()) || "GET";
+      void jQuery.ajax(ajaxSettings);
+    }
+  }, {
+    key: "parseData",
+    value: function parseData(data) {
+      var dataFilter = this.treeWidget.options.dataFilter;
+
+      var getParsedData = function getParsedData() {
+        if (typeof data === "string") {
+          return JSON.parse(data);
+        } else {
+          return data;
         }
-    };
-    return DataLoader;
-}());
-exports["default"] = DataLoader;
+      };
+
+      var parsedData = getParsedData();
+
+      if (dataFilter) {
+        return dataFilter(parsedData);
+      } else {
+        return parsedData;
+      }
+    }
+  }]);
+
+  return DataLoader;
+}();
+
+exports["default"] = DataLoader;