Check if option has data (#2160)

snapappointments · Dec 12, 2018 · c4da3af · c4da3af
1 parent 88d13e5
commit c4da3af
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
@@ -1485,13 +1485,14 @@
 
       for (var index = 0, len = $selectOptions.length; index < len; index++) {
         var i = that.selectpicker.main.map.newIndex[index],
-            option = $selectOptions[index];
+            option = $selectOptions[index],
+            optionData = that.selectpicker.main.data[i] || that.selectpicker.main.hidden[index];
 
-        if (option && option.selected) {
+        if (option && option.selected && optionData) {
           selectedItems.push(option);
 
           if ((selectedItemsInTitle.length < 100 && that.options.selectedTextFormat !== 'count') || selectedItems.length === 1) {
-            var thisData = (that.selectpicker.main.data[i] || that.selectpicker.main.hidden[index]).data,
+            var thisData = optionData.data,
                 icon = thisData.icon && that.options.showIcon ? '<i class="' + that.options.iconBase + ' ' + thisData.icon + '"></i> ' : '',
                 subtext,
                 titleItem;