Increase minimum jQuery version to latest in the 1.x series (select2#…

…5525) * Remove Utils.appendMany
ivaynberg · Mar 14, 2020 · 4bd4bbc · 4bd4bbc
1 parent ab6f846
commit 4bd4bbc
Show file tree

Hide file tree

Showing 8 changed files with 11,013 additions and 9,426 deletions.
diff --git a/src/js/select2/data/array.js b/src/js/select2/data/array.js
@@ -70,7 +70,7 @@ define([
       if (item.children) {
         var $children = this.convertToOptions(item.children);
 
-        Utils.appendMany($option, $children);
+        $option.append($children);
       }
 
       $options.push($option);

diff --git a/src/js/select2/data/select.js b/src/js/select2/data/select.js
@@ -151,7 +151,7 @@ define([
   };
 
   SelectAdapter.prototype.addOptions = function ($options) {
-    Utils.appendMany(this.$element, $options);
+    this.$element.append($options);
   };
 
   SelectAdapter.prototype.option = function (data) {

diff --git a/src/js/select2/selection/multiple.js b/src/js/select2/selection/multiple.js
@@ -109,7 +109,7 @@ define([
 
     var $rendered = this.$selection.find('.select2-selection__rendered');
 
-    Utils.appendMany($rendered, $selections);
+    $rendered.append($selections);
   };
 
   return MultipleSelection;

diff --git a/src/js/select2/utils.js b/src/js/select2/utils.js
@@ -255,23 +255,6 @@ define([
     });
   };
 
-  // Append an array of jQuery nodes to a given element.
-  Utils.appendMany = function ($element, $nodes) {
-    // jQuery 1.7.x does not support $.fn.append() with an array
-    // Fall back to a jQuery object collection using $.fn.add()
-    if ($.fn.jquery.substr(0, 3) === '1.7') {
-      var $jqNodes = $();
-
-      $.map($nodes, function (node) {
-        $jqNodes = $jqNodes.add(node);
-      });
-
-      $nodes = $jqNodes;
-    }
-
-    $element.append($nodes);
-  };
-
   // Cache objects in Utils.__cache instead of $.data (see #4346)
   Utils.__cache = {};
 

diff --git a/tests/integration-jq1.html b/tests/integration-jq1.html
@@ -9,7 +9,7 @@
     <div id="qunit-fixture"></div>
 
     <script src="vendor/qunit-1.23.1.js" type="text/javascript"></script>
-    <script src="vendor/jquery-1.7.2.js" type="text/javascript"></script>
+    <script src="vendor/jquery-1.12.4.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>

diff --git a/tests/unit-jq1.html b/tests/unit-jq1.html
@@ -51,7 +51,7 @@
     </div>
 
     <script src="vendor/qunit-1.23.1.js" type="text/javascript"></script>
-    <script src="vendor/jquery-1.7.2.js" type="text/javascript"></script>
+    <script src="vendor/jquery-1.12.4.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>