Merge pull request #1 from chung1905/fix-data-default-value

Fix data-default-value not set for region if only 1 country
chung1905 · Nov 2, 2021 · 0531424 · 0531424
2 parents 7de1761 + 5cadc91
commit 0531424
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/dist/crs.js b/dist/crs.js
diff --git a/dist/crs.min.js b/dist/crs.min.js
diff --git a/dist/jquery.crs.js b/dist/jquery.crs.js
diff --git a/dist/jquery.crs.min.js b/dist/jquery.crs.min.js
diff --git a/source/source-crs.js b/source/source-crs.js
@@ -106,7 +106,7 @@
             };
 
             // if the country dropdown has a default value, populate the region field as well
-            if (defaultSelectedValue !== null && countryElement.selectedIndex > 0) {
+            if (defaultSelectedValue !== null && countryElement.selectedIndex >= _showEmptyCountryOption) {
                 _populateRegionFields(countryElement, regionElement);
 
                 var defaultRegionSelectedValue = regionElement.getAttribute("data-default-value");

diff --git a/source/source-jquery.crs.js b/source/source-jquery.crs.js
@@ -99,7 +99,7 @@
             });
 
             // if the country dropdown has a default value, populate the region field as well
-            if (defaultSelectedValue && countryElement.selectedIndex > 0) {
+            if (defaultSelectedValue && countryElement.selectedIndex >= _showEmptyCountryOption) {
                 _populateRegionFields(countryElement, regionElement);
 
                 var defaultRegionSelectedValue = $(regionElement).attr("data-default-value");
@@ -208,7 +208,7 @@
 
             var weWantAndHaveShortCodes = displayType === 'shortcode' && regionData.hasShortcodes;
             var indexToSort = weWantAndHaveShortCodes ? 1 : 0;
-            regionData.regions.sort(function(a, b) {
+            regionData.regions.sort(function (a, b) {
                 var x = a[indexToSort].toLowerCase();
                 var y = b[indexToSort].toLowerCase();
                 return x < y ? -1 : x > y ? 1 : 0;
@@ -245,7 +245,7 @@
         }
 
         // now prepend the preferred countries
-        for (var i=0; i<preferredShortCodes.length; i++) {
+        for (var i = 0; i < preferredShortCodes.length; i++) {
             var code = preferredShortCodes[i];
             updatedCountries.unshift(preferredMap[code]);
         }