Tests use jQuery 1.7.2

As jQuery 1.7.2 is the lowest version of jQuery supported by Select2,
it makes sense to run the tests on it. For the most part, we can
assume that the newer versions of Select2 are backwards compatible
enough such that this isn't an issue.

The recommended version of jQuery to use is the latest though, which
is why the jQuery file is only included in the tests.

This revealed a few issues with our data fallbacks and `.append`
functionality that was introduced in jQuery 1.8.

dist/js/select2.amd.full.js

@@ -1088,7 +1088,7 @@ define('select2/selection/multiple',[
       return;
     }
 
-    var $selections = [];
+    var $selections = $();
 
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
@@ -1101,7 +1101,7 @@ define('select2/selection/multiple',[
 
       $selection.data('data', selection);
 
-      $selections.push($selection);
+      $selections = $selections.add($selection);
     }
 
     this.$selection.find('.select2-selection__rendered').append($selections);
@@ -2659,7 +2659,7 @@ define('select2/data/array',[
     if ($option.length === 0) {
       $option = this.option(data);
 
-      this.addOptions([$option]);
+      this.addOptions($option);
     }
 
     ArrayAdapter.__super__.select.call(this, data);
@@ -2673,7 +2673,7 @@ define('select2/data/array',[
       return self.item($(this)).id;
     }).get();
 
-    var $options = [];
+    var $options = $();
 
     // Filter out all items except for the one passed in the argument
     function onlyItem (item) {
@@ -2707,7 +2707,7 @@ define('select2/data/array',[
         $option.append($children);
       }
 
-      $options.push($option);
+      $options = $options.add($option);
     }
 
     return $options;
@@ -2887,7 +2887,7 @@ define('select2/data/tags',[
         var $option = self.option(tag);
         $option.attr('data-select2-tag', true);
 
-        self.addOptions([$option]);
+        self.addOptions($option);
 
         self.insertTag(data, tag);
       }
@@ -4160,7 +4160,8 @@ define('select2/options',[
         );
       }
 
-      $e.data('ajax-Url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};
@@ -5155,8 +5156,8 @@ define('select2/compat/inputData',[
   };
 
   InputData.prototype.addOptions = function (_, $options) {
-    var options = $.map($options, function ($option) {
-      return $.data($option[0], 'data');
+    var options = $.map($options, function (option) {
+      return $.data(option, 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);

dist/js/select2.amd.js

@@ -1088,7 +1088,7 @@ define('select2/selection/multiple',[
       return;
     }
 
-    var $selections = [];
+    var $selections = $();
 
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
@@ -1101,7 +1101,7 @@ define('select2/selection/multiple',[
 
       $selection.data('data', selection);
 
-      $selections.push($selection);
+      $selections = $selections.add($selection);
     }
 
     this.$selection.find('.select2-selection__rendered').append($selections);
@@ -2659,7 +2659,7 @@ define('select2/data/array',[
     if ($option.length === 0) {
       $option = this.option(data);
 
-      this.addOptions([$option]);
+      this.addOptions($option);
     }
 
     ArrayAdapter.__super__.select.call(this, data);
@@ -2673,7 +2673,7 @@ define('select2/data/array',[
       return self.item($(this)).id;
     }).get();
 
-    var $options = [];
+    var $options = $();
 
     // Filter out all items except for the one passed in the argument
     function onlyItem (item) {
@@ -2707,7 +2707,7 @@ define('select2/data/array',[
         $option.append($children);
       }
 
-      $options.push($option);
+      $options = $options.add($option);
     }
 
     return $options;
@@ -2887,7 +2887,7 @@ define('select2/data/tags',[
         var $option = self.option(tag);
         $option.attr('data-select2-tag', true);
 
-        self.addOptions([$option]);
+        self.addOptions($option);
 
         self.insertTag(data, tag);
       }
@@ -4160,7 +4160,8 @@ define('select2/options',[
         );
       }
 
-      $e.data('ajax-Url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};

dist/js/select2.full.js

@@ -1527,7 +1527,7 @@ define('select2/selection/multiple',[
       return;
     }
 
-    var $selections = [];
+    var $selections = $();
 
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
@@ -1540,7 +1540,7 @@ define('select2/selection/multiple',[
 
       $selection.data('data', selection);
 
-      $selections.push($selection);
+      $selections = $selections.add($selection);
     }
 
     this.$selection.find('.select2-selection__rendered').append($selections);
@@ -3098,7 +3098,7 @@ define('select2/data/array',[
     if ($option.length === 0) {
       $option = this.option(data);
 
-      this.addOptions([$option]);
+      this.addOptions($option);
     }
 
     ArrayAdapter.__super__.select.call(this, data);
@@ -3112,7 +3112,7 @@ define('select2/data/array',[
       return self.item($(this)).id;
     }).get();
 
-    var $options = [];
+    var $options = $();
 
     // Filter out all items except for the one passed in the argument
     function onlyItem (item) {
@@ -3146,7 +3146,7 @@ define('select2/data/array',[
         $option.append($children);
       }
 
-      $options.push($option);
+      $options = $options.add($option);
     }
 
     return $options;
@@ -3326,7 +3326,7 @@ define('select2/data/tags',[
         var $option = self.option(tag);
         $option.attr('data-select2-tag', true);
 
-        self.addOptions([$option]);
+        self.addOptions($option);
 
         self.insertTag(data, tag);
       }
@@ -4599,7 +4599,8 @@ define('select2/options',[
         );
       }
 
-      $e.data('ajax-Url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};
@@ -5594,8 +5595,8 @@ define('select2/compat/inputData',[
   };
 
   InputData.prototype.addOptions = function (_, $options) {
-    var options = $.map($options, function ($option) {
-      return $.data($option[0], 'data');
+    var options = $.map($options, function (option) {
+      return $.data(option, 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);

dist/js/select2.js

@@ -1527,7 +1527,7 @@ define('select2/selection/multiple',[
       return;
     }
 
-    var $selections = [];
+    var $selections = $();
 
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
@@ -1540,7 +1540,7 @@ define('select2/selection/multiple',[
 
       $selection.data('data', selection);
 
-      $selections.push($selection);
+      $selections = $selections.add($selection);
     }
 
     this.$selection.find('.select2-selection__rendered').append($selections);
@@ -3098,7 +3098,7 @@ define('select2/data/array',[
     if ($option.length === 0) {
       $option = this.option(data);
 
-      this.addOptions([$option]);
+      this.addOptions($option);
     }
 
     ArrayAdapter.__super__.select.call(this, data);
@@ -3112,7 +3112,7 @@ define('select2/data/array',[
       return self.item($(this)).id;
     }).get();
 
-    var $options = [];
+    var $options = $();
 
     // Filter out all items except for the one passed in the argument
     function onlyItem (item) {
@@ -3146,7 +3146,7 @@ define('select2/data/array',[
         $option.append($children);
       }
 
-      $options.push($option);
+      $options = $options.add($option);
     }
 
     return $options;
@@ -3326,7 +3326,7 @@ define('select2/data/tags',[
         var $option = self.option(tag);
         $option.attr('data-select2-tag', true);
 
-        self.addOptions([$option]);
+        self.addOptions($option);
 
         self.insertTag(data, tag);
       }
@@ -4599,7 +4599,8 @@ define('select2/options',[
         );
       }
 
-      $e.data('ajax-Url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};

src/js/select2/compat/inputData.js

@@ -116,8 +116,8 @@ define([
   };
 
   InputData.prototype.addOptions = function (_, $options) {
-    var options = $.map($options, function ($option) {
-      return $.data($option[0], 'data');
+    var options = $.map($options, function (option) {
+      return $.data(option, 'data');
     });
 
     this._currentData.push.apply(this._currentData, options);

src/js/select2/data/array.js

@@ -19,7 +19,7 @@ define([
     if ($option.length === 0) {
       $option = this.option(data);
 
-      this.addOptions([$option]);
+      this.addOptions($option);
     }
 
     ArrayAdapter.__super__.select.call(this, data);
@@ -33,7 +33,7 @@ define([
       return self.item($(this)).id;
     }).get();
 
-    var $options = [];
+    var $options = $();
 
     // Filter out all items except for the one passed in the argument
     function onlyItem (item) {
@@ -67,7 +67,7 @@ define([
         $option.append($children);
       }
 
-      $options.push($option);
+      $options = $options.add($option);
     }
 
     return $options;

src/js/select2/data/tags.js

@@ -71,7 +71,7 @@ define([
         var $option = self.option(tag);
         $option.attr('data-select2-tag', true);
 
-        self.addOptions([$option]);
+        self.addOptions($option);
 
         self.insertTag(data, tag);
       }

src/js/select2/options.js

@@ -76,7 +76,8 @@ define([
         );
       }
 
-      $e.data('ajax-Url', $e.data('ajaxUrl'));
+      $e.attr('ajax--url', $e.data('ajaxUrl'));
+      $e.data('ajax--url', $e.data('ajaxUrl'));
     }
 
     var dataset = {};

src/js/select2/selection/multiple.js

@@ -76,7 +76,7 @@ define([
       return;
     }
 
-    var $selections = [];
+    var $selections = $();
 
     for (var d = 0; d < data.length; d++) {
       var selection = data[d];
@@ -89,7 +89,7 @@ define([
 
       $selection.data('data', selection);
 
-      $selections.push($selection);
+      $selections = $selections.add($selection);
     }
 
     this.$selection.find('.select2-selection__rendered').append($selections);

tests/runner.html

@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
   <head>
-    <link rel="stylesheet" href="../vendor/qunit-1.14.0.css" type="text/css" />
+    <link rel="stylesheet" href="vendor/qunit-1.14.0.css" type="text/css" />
     <link rel="stylesheet" href="../../dist/css/select2.css" type="text/css" />
   </head>
   <body>
@@ -49,7 +49,7 @@
     </div>
 
     <script src="vendor/qunit-1.14.0.js" type="text/javascript"></script>
-    <script src="../vendor/jquery-2.1.0.js" type="text/javascript"></script>
+    <script src="vendor/jquery-1.7.2.js" type="text/javascript"></script>
     <script src="../dist/js/select2.full.js" type="text/javascript"></script>
 
     <script src="helpers.js" type="text/javascript"></script>
@@ -60,7 +60,7 @@
     <script src="data/base-tests.js" type="text/javascript"></script>
     <script src="data/inputData-tests.js" type="text/javascript"></script>
     <script src="data/select-tests.js" type="text/javascript"></script>
-    <script src="tags-tests.js" type="text/javascript"></script>
+    <script src="data/tags-tests.js" type="text/javascript"></script>
 
     <script src="data/maximumInputLength-tests.js" type="text/javascript"></script>
     <script src="data/maximumSelectionLength-tests.js" type="text/javascript"></script>

tests/selection/multiple-tests.js

@@ -65,8 +65,8 @@ test('escapeMarkup is being used', function (assert) {
   }]);
 
   assert.equal(
-    $rendered.text().indexOf(unescapedText),
-    1,
+    $rendered.text().substr(1),
+    unescapedText,
     'The text should be escaped by default to prevent injection'
   );
 });