jqtree 1.7.3 → 1.7.4

package/.github/workflows/static.yml

@@ -0,0 +1,57 @@
+name: Deploy static content to Pages
+
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+    branches: ["master"]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.2'
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Install pnpm
+        run: npm install -g pnpm
+      - name: Install ruby packages
+        working-directory: ./docs
+        run: bundle
+      - name: Install javascript packages
+        working-directory: ./docs
+        run: pnpm install
+      - name: Build docs css
+        working-directory: ./docs
+        run: pnpm run build_docs_css
+      - name: Jekyll Build
+        working-directory: ./docs
+        run: bundle exec jekyll build
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: './docs/_site'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v2

package/bower.json

@@ -1,6 +1,6 @@
 {
     "name": "jqTree",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "main": [
         "jqtree.css",
         "jqtree-circle.png",

package/css/jqtree.postcss

@@ -54,6 +54,10 @@ ul.jqtree-tree {
         cursor: pointer;
         position: relative;
         display: flex;
+
+        &:has(.jqtree-title-button-right) {
+            display: block;
+        }
     }
 
     .jqtree-title {

package/docs/.ruby-version

@@ -0,0 +1 @@
+3.2.2

package/docs/Gemfile

@@ -1,2 +1,5 @@
-source 'https://rubygems.org'
-gem 'github-pages', group: :jekyll_plugins
+source "https://rubygems.org"
+ruby Bundler.root.join('.ruby-version').read
+
+gem "jekyll", "~> 4.3.2"
+gem "minima", "~> 2.5"

package/docs/Gemfile.lock

@@ -1,203 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
-    dnsruby (1.70.0)
-      simpleidn (~> 0.2.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.7.10)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.4)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.3)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
+    google-protobuf (3.24.3-arm64-darwin)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.3)
+    jekyll (4.3.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (>= 0.7, < 2)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (>= 1.17, < 3)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
-    jekyll-feed (0.15.1)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
-      jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-redirect-from (0.16.0)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
@@ -205,58 +47,36 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.8.4)
+    mercenary (0.4.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.20.0)
-    nokogiri (1.13.10)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
-    racc (1.7.1)
+    public_suffix (5.0.3)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rouge (4.1.3)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    zeitwerk (2.6.11)
+    sass-embedded (1.67.0-arm64-darwin)
+      google-protobuf (~> 3.23)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.4.2)
+    webrick (1.8.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
 
 DEPENDENCIES
-  github-pages
+  jekyll (~> 4.3.2)
+  minima (~> 2.5)
+
+RUBY VERSION
+   ruby 3.2.2p53
 
 BUNDLED WITH
-   1.17.2
+   2.4.10

package/docs/_config.yml

@@ -6,19 +6,119 @@ baseurl: "/jqTree"
 url: "http://mbraak.github.io/jqTree/"
 
 collections:
-    entries:
-        output: false
-    examples:
-        output: true
+  entries:
+    output: false
+    order:
+      - general/index.md
+      - general/introduction.md
+      - general/features.md
+      - general/demo.html
+      - general/requirements.md
+      - general/downloads.md
+      - general/tutorial.md
+      - general/examples.md
+      - general/usecases.md
+      - general/changelog.md
+      - options/index.md
+      - options/animationspeed.md
+      - options/autoescape.md
+      - options/autoopen.md
+      - options/buttonleft.md
+      - options/closedicon.md
+      - options/data.md
+      - options/datafilter.md
+      - options/data-url.md
+      - options/draganddrop.md
+      - options/keyboardsupport.md
+      - options/oncanmove.md
+      - options/oncanmoveto.md
+      - options/oncanselectnode.md
+      - options/oncreateli.md
+      - options/ondragmove.md
+      - options/ondragstop.md
+      - options/onismovehandle.md
+      - options/onloadfailed.md
+      - options/onloading.md
+      - options/openedicon.md
+      - options/openfolderdelay.md
+      - options/rtl.md
+      - options/savestate.md
+      - options/selectable.md
+      - options/showemptyfolder.md
+      - options/slide.md
+      - options/start_dnd_delay.md
+      - options/tabindex.md
+      - options/usecontextmenu.md
+      - functions/index.md
+      - functions/addparentnode.md
+      - functions/addnodeafter.md
+      - functions/addnodebefore.md
+      - functions/appendnode.md
+      - functions/closenode.md
+      - functions/destroy.md
+      - functions/getnodebycallback.md
+      - functions/getnodebyid.md
+      - functions/getnodebyhtmlelement.md
+      - functions/getselectednode.md
+      - functions/getstate.md
+      - functions/gettree.md
+      - functions/isdragging.md
+      - functions/is-node-selected.md
+      - functions/loaddata.md
+      - functions/loaddatafromurl.md
+      - functions/movedown.md
+      - functions/movenode.md
+      - functions/moveup.md
+      - functions/opennode.md
+      - functions/prependnode.md
+      - functions/refresh.md
+      - functions/reload.md
+      - functions/removenode.md
+      - functions/selectnode.md
+      - functions/scrolltonode.md
+      - functions/setoption.md
+      - functions/setstate.md
+      - functions/toggle.md
+      - functions/tojson.md
+      - functions/updatenode.md
+      - events/index.md
+      - events/tree-click.md
+      - events/tree-close.md
+      - events/tree-contextmenu.md
+      - events/tree-dblclick.md
+      - events/tree-init.md
+      - events/tree-load-data.md
+      - events/tree-loading-data.md
+      - events/tree-move.md
+      - events/tree-refresh.md
+      - events/tree-open.md
+      - events/tree-select.md
+      - multiple_selection/index.md
+      - multiple_selection/add-to-selection.md
+      - multiple_selection/get-selected-nodes.md
+      - multiple_selection/remove-from-selection.md
+      - node/index.md
+      - node/children.md
+      - node/getdata.md
+      - node/getlevel.md
+      - node/getnextnode.md
+      - node/getnextsibling.md
+      - node/getnextvisiblenode.md
+      - node/getpreviousnode.md
+      - node/getprevioussibling.md
+      - node/getpreviousvisiblenode.md
+      - node/parent.md
+  examples:
+    output: true
 
 defaults:
-    - scope:
-        path: ""
-        type: "examples"
-      values:
-        layout: "example"
+  - scope:
+      path: ""
+      type: "examples"
+    values:
+      layout: "example"
 
-jqtree_version: 1.7.3
+jqtree_version: 1.7.4
 
 # Build settings
 markdown: kramdown

package/docs/_entries/{10_changelog.md → general/changelog.md}

@@ -3,6 +3,11 @@ title: Changelog
 name: changelog
 ---
 
+#### 1.7.4 (september 24 2023)
+
+-   Issue #675: support toggler on the right with multiline (thanks to Odungern)
+-   Issue #751: fix inconsistent/incorrect drag & drop node highlighting (thanks to Tom De Ford)
+
 #### 1.7.3 (september 16 2023)
 
 -   Issue #746: set jQuery as a peer dependency
@@ -11,7 +16,7 @@ name: changelog
 #### 1.7.2 (september 14 2023)
 
 -   Issue #732: improve types of closedIcon and openedIcon
--   Issue #736: use the bundle in the package.json
+-   Issue #736: use the bundle in the package.json (thanks to TivoSoho)
 
 #### 1.7.1 (august 6 2023)
 

package/docs/_entries/multiple_selection/get-selected-nodes.md

@@ -0,0 +1,10 @@
+---
+title: getSelectedNodes
+name: multiple-get-selected-nodes
+---
+
+Get the selected nodes. Return an array of nodes
+
+{% highlight js %}
+var node = $tree.tree('getSelectedNodes');
+{% endhighlight %}

package/jqtree.css

@@ -57,6 +57,10 @@ ul.jqtree-tree {
         display: flex;
     }
 
+    ul.jqtree-tree .jqtree-element:has(.jqtree-title-button-right) {
+            display: block;
+        }
+
     ul.jqtree-tree .jqtree-title {
         color: #1c4257;
         vertical-align: middle;

package/lib/dragAndDropHandler.js

@@ -445,6 +445,16 @@ var HitAreasGenerator = /*#__PURE__*/function (_VisibleNodeIterator) {
     value: function handleOpenFolder(node, $element) {
       if (node === this.currentNode) {
         // Cannot move inside current item
+
+        // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
+        var top = this.getTop($element);
+        var height = $element.height() || 0;
+        this.addPosition(node, _node.Position.None, top);
+        if (height > 5) {
+          // Subtract 5 pixels to allow more space for the next element.
+          this.addPosition(node, _node.Position.None, top + height - 5);
+        }
+
         // Stop iterating
         return false;
       }
@@ -535,7 +545,7 @@ var HitAreasGenerator = /*#__PURE__*/function (_VisibleNodeIterator) {
       var i = 0;
       while (i < positionCount) {
         var position = positionsInGroup[i];
-        if (position) {
+        if (position && position.position !== _node.Position.None) {
           hitAreas.push({
             top: areaTop,
             bottom: areaTop + areaHeight,

package/lib/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var version = "1.7.3";
+var version = "1.7.4";
 var _default = version;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jqtree",
-    "version": "1.7.3",
+    "version": "1.7.4",
     "description": "Tree widget for jQuery",
     "keywords": [
         "jquery-plugin",

package/src/dragAndDropHandler.ts

@@ -547,6 +547,17 @@ export class HitAreasGenerator extends VisibleNodeIterator {
     protected handleOpenFolder(node: Node, $element: JQuery): boolean {
         if (node === this.currentNode) {
             // Cannot move inside current item
+
+            // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
+            const top = this.getTop($element);
+            const height = $element.height() || 0;
+            this.addPosition(node, Position.None, top);
+
+            if (height > 5) {
+                // Subtract 5 pixels to allow more space for the next element.
+                this.addPosition(node, Position.None, top + height - 5);
+            }
+
             // Stop iterating
             return false;
         }
@@ -651,7 +662,7 @@ export class HitAreasGenerator extends VisibleNodeIterator {
         while (i < positionCount) {
             const position = positionsInGroup[i];
 
-            if (position) {
+            if (position && position.position !== Position.None) {
                 hitAreas.push({
                     top: areaTop,
                     bottom: areaTop + areaHeight,

package/src/version.ts

@@ -1,3 +1,3 @@
-const version = "1.7.3";
+const version = "1.7.4";
 
 export default version;

package/tree.jquery.debug.js

@@ -1,5 +1,5 @@
 /*
-JqTree 1.7.3
+JqTree 1.7.4
 
 Copyright 2023 Marco Braak
 
@@ -292,7 +292,7 @@ var jqtree = (function (exports) {
     return typeof key === "symbol" ? key : String(key);
   }
 
-  var version = "1.7.3";
+  var version = "1.7.4";
 
   var Position = /*#__PURE__*/function (Position) {
     Position[Position["Before"] = 1] = "Before";
@@ -1414,6 +1414,16 @@ var jqtree = (function (exports) {
       value: function handleOpenFolder(node, $element) {
         if (node === this.currentNode) {
           // Cannot move inside current item
+
+          // Dnd over the current element is not possible: add a position with type None for the top and the bottom.
+          var top = this.getTop($element);
+          var height = $element.height() || 0;
+          this.addPosition(node, Position.None, top);
+          if (height > 5) {
+            // Subtract 5 pixels to allow more space for the next element.
+            this.addPosition(node, Position.None, top + height - 5);
+          }
+
           // Stop iterating
           return false;
         }
@@ -1504,7 +1514,7 @@ var jqtree = (function (exports) {
         var i = 0;
         while (i < positionCount) {
           var position = positionsInGroup[i];
-          if (position) {
+          if (position && position.position !== Position.None) {
             hitAreas.push({
               top: areaTop,
               bottom: areaTop + areaHeight,