Added the element reference in the data

This also fixes `_normalizeItem` for cases where `text` doesn't
exist, so it doesn't clobber the item.

Author: kevin-brown

dist/js/select2.amd.full.js

@@ -2239,6 +2239,7 @@ define('select2/data/select',[
     var $option = $(option);
 
     var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
 
     // Override the option's data with the combined data
     $.data(option, 'data', normalizedData);
@@ -2283,19 +2284,18 @@ define('select2/data/select',[
     }
 
     data = this._normalizeItem(data);
+    data.element = $option[0];
 
     $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item.text == null) {
-      item = {
-        id: item,
-        text: item
-      };
-    }
+    $.extend(item, {
+      id: item,
+      text: item
+    });
 
     var defaults = {
       selected: false,

dist/js/select2.amd.js

@@ -2239,6 +2239,7 @@ define('select2/data/select',[
     var $option = $(option);
 
     var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
 
     // Override the option's data with the combined data
     $.data(option, 'data', normalizedData);
@@ -2283,19 +2284,18 @@ define('select2/data/select',[
     }
 
     data = this._normalizeItem(data);
+    data.element = $option[0];
 
     $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item.text == null) {
-      item = {
-        id: item,
-        text: item
-      };
-    }
+    $.extend(item, {
+      id: item,
+      text: item
+    });
 
     var defaults = {
       selected: false,

dist/js/select2.full.js

@@ -11774,6 +11774,7 @@ define('select2/data/select',[
     var $option = $(option);
 
     var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
 
     // Override the option's data with the combined data
     $.data(option, 'data', normalizedData);
@@ -11818,19 +11819,18 @@ define('select2/data/select',[
     }
 
     data = this._normalizeItem(data);
+    data.element = $option[0];
 
     $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item.text == null) {
-      item = {
-        id: item,
-        text: item
-      };
-    }
+    $.extend(item, {
+      id: item,
+      text: item
+    });
 
     var defaults = {
       selected: false,

dist/js/select2.full.min.js

@@ -2667,6 +2667,7 @@ define('select2/data/select',[
     var $option = $(option);
 
     var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
 
     // Override the option's data with the combined data
     $.data(option, 'data', normalizedData);
@@ -2711,19 +2712,18 @@ define('select2/data/select',[
     }
 
     data = this._normalizeItem(data);
+    data.element = $option[0];
 
     $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item.text == null) {
-      item = {
-        id: item,
-        text: item
-      };
-    }
+    $.extend(item, {
+      id: item,
+      text: item
+    });
 
     var defaults = {
       selected: false,

dist/js/select2.js

@@ -146,6 +146,7 @@ define([
     var $option = $(option);
 
     var normalizedData = this._normalizeItem(data);
+    normalizedData.element = option;
 
     // Override the option's data with the combined data
     $.data(option, 'data', normalizedData);
@@ -190,19 +191,18 @@ define([
     }
 
     data = this._normalizeItem(data);
+    data.element = $option[0];
 
     $.data($option[0], 'data', data);
 
     return data;
   };
 
   SelectAdapter.prototype._normalizeItem = function (item) {
-    if (item.text == null) {
-      item = {
-        id: item,
-        text: item
-      };
-    }
+    $.extend(item, {
+      id: item,
+      text: item
+    });
 
     var defaults = {
       selected: false,