Fixed default selections for arrays

Author: kevin-brown

dist/js/select2.amd.full.js

@@ -1137,7 +1137,8 @@ define('select2/data/select',[
       data = {
         id: $option.val(),
         text: $option.html(),
-        disabled: $option.prop('disabled')
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected')
       };
     } else if ($option.is('optgroup')) {
       data = {
@@ -1244,9 +1245,9 @@ define('select2/data/array',[
         continue;
       }
 
-      var option = this.option(item);
+      var $option = this.option(item);
 
-      this.$element.append(option);
+      this.$element.append($option);
     }
   };
 

dist/js/select2.amd.js

@@ -1137,7 +1137,8 @@ define('select2/data/select',[
       data = {
         id: $option.val(),
         text: $option.html(),
-        disabled: $option.prop('disabled')
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected')
       };
     } else if ($option.is('optgroup')) {
       data = {
@@ -1244,9 +1245,9 @@ define('select2/data/array',[
         continue;
       }
 
-      var option = this.option(item);
+      var $option = this.option(item);
 
-      this.$element.append(option);
+      this.$element.append($option);
     }
   };
 

dist/js/select2.full.js

@@ -10672,7 +10672,8 @@ define('select2/data/select',[
       data = {
         id: $option.val(),
         text: $option.html(),
-        disabled: $option.prop('disabled')
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected')
       };
     } else if ($option.is('optgroup')) {
       data = {
@@ -10779,9 +10780,9 @@ define('select2/data/array',[
         continue;
       }
 
-      var option = this.option(item);
+      var $option = this.option(item);
 
-      this.$element.append(option);
+      this.$element.append($option);
     }
   };
 

dist/js/select2.full.min.js

@@ -1565,7 +1565,8 @@ define('select2/data/select',[
       data = {
         id: $option.val(),
         text: $option.html(),
-        disabled: $option.prop('disabled')
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected')
       };
     } else if ($option.is('optgroup')) {
       data = {
@@ -1672,9 +1673,9 @@ define('select2/data/array',[
         continue;
       }
 
-      var option = this.option(item);
+      var $option = this.option(item);
 
-      this.$element.append(option);
+      this.$element.append($option);
     }
   };
 

dist/js/select2.js

@@ -473,15 +473,6 @@ <h2>Example code</h2>
 
   var data = [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }];
 
-  var data = [];
-
-  for (var i = 0; i < 9999; i++) {
-    data.push({
-      id: i.toString(),
-      text: i
-    });
-  }
-
   var $ajax = $(".js-example-data-ajax");
 
   var $disabledResults = $(".js-example-disabled-results");

dist/js/select2.min.js

@@ -46,9 +46,9 @@ define([
         continue;
       }
 
-      var option = this.option(item);
+      var $option = this.option(item);
 
-      this.$element.append(option);
+      this.$element.append($option);
     }
   };
 

docs/examples.html

@@ -158,7 +158,8 @@ define([
       data = {
         id: $option.val(),
         text: $option.html(),
-        disabled: $option.prop('disabled')
+        disabled: $option.prop('disabled'),
+        selected: $option.prop('selected')
       };
     } else if ($option.is('optgroup')) {
       data = {