bullet_train-sortable 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7957d032f4dbaedb2516f60998b7f8a2f5c2601ec96809080afeae9945527eb
-  data.tar.gz: c83aad2686779f833aea7bc9d3ac65233305a836836021208c056fc44ba9ef6e
+  metadata.gz: 11c6147e94228b261835e381c28d238e73736f022489a790857ab51212970bfc
+  data.tar.gz: c4e5a5c700f368aebe1087d7c4acc15b4f5dd8084ae6dae6a817a932595e8a02
 SHA512:
-  metadata.gz: eda0a9a61cff10106625d00d29d6bf826304d82129b2f39e5ce469e743c7158cf97ba4d268febb63924fb0c22c0ca177fd048a8a84b0af25b0e90957fd688155
-  data.tar.gz: 33a0c3c93dadd17f8e77b13c221becbd6cc5b0dd827de95e9671a1f28e1d698a10da51fbfe8c42cc0cf4de6288aae9e27079e0378aeeed7a1340d4a00a70e09f
+  metadata.gz: edca08683a8ec8982b8ecd7b826d39f672632a8455e90ad0eebee4fd2660c0e7eccca81d241ec5d209cf17871b7260a18b34e8fd882e7f0495e180dea432d955
+  data.tar.gz: 5487e12f52823841509a303b3485125f1f920267680ef1a7d2f5147d6875eab5fff0abde4c72efb1699870c8e4cb8e4e15003fb59ae178250074a8988b163d96

data/app/javascript/controllers/sortable_controller.js

@@ -1,5 +1,6 @@
 import { Controller } from "@hotwired/stimulus"
 import { post } from '@rails/request.js'
+import jquery from "jquery";
 require("dragula/dist/dragula.min.css")
 
 import dragula from 'dragula';
@@ -13,6 +14,12 @@ export default class extends Controller {
   // will be reissued as native dom events name prepended with 'sortable:' e.g. 'sortable:drag', 'sortable:drop', etc
   static pluginEventsToReissue = [ "drag", "dragend", "drop", "cancel", "remove", "shadow", "over", "out", "cloned" ]
 
+  initialize() {
+    if (window.jQuery === undefined) {
+      window.jQuery = jquery // required for select2 used for time zone select, but we also use global jQuery throughout below
+    }
+  }
+
   connect() {
     if (!this.hasReorderPathValue) { return }
     this.initPluginInstance()
@@ -26,11 +33,11 @@ export default class extends Controller {
     const self = this
     this.plugin = dragula([this.element], {
       moves: function(el, container, handle) {
-        var $handles = $(el).find('.reorder-handle')
+        var $handles = jQuery(el).find('.reorder-handle')
         if ($handles.length) {
-          return !!$(handle).closest('.reorder-handle').length
+          return !!jQuery(handle).closest('.reorder-handle').length
         } else {
-          if (!$(handle).closest('.undraggable').length) {
+          if (!jQuery(handle).closest('.undraggable').length) {
             return self.element === container
           } else {
             return false
@@ -38,7 +45,7 @@ export default class extends Controller {
         }
       },
       accepts: function (el, target, source, sibling) {
-        if ($(sibling).hasClass('undraggable') && $(sibling).prev().hasClass('undraggable')) {
+        if (jQuery(sibling).hasClass('undraggable') && jQuery(sibling).prev().hasClass('undraggable')) {
           return false
         } else {
           return true
@@ -51,7 +58,7 @@ export default class extends Controller {
       }
     }).on('over', function (el, container) {
       // deselect any text fields, or else things go slow!
-      $(document.activeElement).blur()
+      jQuery(document.activeElement).blur()
     })
     
     this.initReissuePluginEventsAsNativeEvents()

data/lib/bullet_train/sortable/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Sortable
-    VERSION = "1.7.1"
+    VERSION = "1.7.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-sortable
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard