Skip to content

Commit 1a8d56e

Browse files
committed
victorjonsson#567 Putting Åland in the back of the country list + various fixes in test dir
1 parent c44fc9e commit 1a8d56e

File tree

4 files changed

+5
-52
lines changed

4 files changed

+5
-52
lines changed

src/modules/location.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
validatorFunction : function(str) {
2222
return $.inArray(str.toLowerCase(), this.countries) > -1;
2323
},
24-
countries : ['afghanistan','albania','algeria','american samoa','andorra','angola','anguilla','antarctica','antigua and barbuda','argentina','armenia','aruba','australia','austria','azerbaijan','bahamas','bahrain','bangladesh','barbados','belarus','belgium','belize','benin','bermuda','bhutan','bolivia','bonaire','bosnia and herzegovina','botswana','bouvet island','brazil','british indian ocean territory','brunei darussalam','bulgaria','burkina faso','burundi','cabo verde','cambodia','cameroon','canada','cayman islands','central african republic','chad','chile','china','christmas island','cocos islands','colombia','comoros','democratic republic of the congo','congo','cook islands','costa rica','côte d\'ivoire','croatia','cuba','curaçao','cyprus','czechia','denmark','djibouti','dominica','dominican republic','ecuador','egypt','el salvador','equatorial guinea','eritrea','estonia','ethiopia','falkland islands','faroe islands','fiji','finland','france','french guiana','french polynesia','french southern territories','gabon','gambia','georgia','germany','ghana','gibraltar','greece','greenland','grenada','guadeloupe','guam','guatemala','guernsey','guinea','guinea-bissau','guyana','haiti','heard island and mcdonald islands','honduras','hong kong','hungary','iceland','india','indonesia','iran','iraq','ireland','isle of man','israel','italy','jamaica','japan','jersey','jordan','kazakhstan','kenya','kiribati','north korea','south korea','kuwait','kyrgyzstan','laos','latvia','lebanon','lesotho','liberia','libya','liechtenstein','lithuania','luxembourg','macao','macedonia','madagascar','malawi','malaysia','maldives','mali','malta','marshall islands','martinique','mauritania','mauritius','mayotte','mexico','micronesia','moldova','monaco','mongolia','montenegro','montserrat','morocco','mozambique','myanmar','namibia','nauru','nepal','netherlands','new caledonia','new zealand','nicaragua','niger','nigeria','niue','norfolk island','northern mariana islands','norway','oman','pakistan','palau','palestine','panama','papua new guinea','paraguay','peru','philippines','pitcairn','poland','portugal','puerto rico','qatar','réunion','romania','russia','rwanda','saint barthélemy','saint helena',' ascension and tristan da cunha','saint kitts and nevis','saint lucia','saint martin','saint pierre and miquelon','saint vincent and the grenadines','samoa','san marino','sao tome and principe','saudi arabia','senegal','serbia','seychelles','sierra leone','singapore','sint maarten','slovakia','slovenia','solomon islands','somalia','south africa','south georgia and the south sandwich islands','south sudan','spain','sri lanka','sudan','suriname','svalbard and jan mayen','swaziland','sweden','switzerland','syria','taiwan','tajikistan','tanzania','thailand','timor-leste','togo','tokelau','tonga','trinidad and tobago','tunisia','turkey','turkmenistan','turks and caicos islands','tuvalu','uganda','ukraine','united arab emirates','united kingdom','united states minor outlying islands','united states','uruguay','uzbekistan','vanuatu','venezuela','vatican city','vietnam','virgin islands (british)','virgin islands (us)','wallis and futuna','western sahara','yemen','zambia','zimbabwe','åland islands'],
24+
countries : ['afghanistan','albania','algeria','american samoa','andorra','angola','anguilla','antarctica','antigua and barbuda','argentina','armenia','aruba','australia','austria','azerbaijan','bahamas','bahrain','bangladesh','barbados','belarus','belgium','belize','benin','bermuda','bhutan','bolivia','bonaire','bosnia and herzegovina','botswana','bouvet island','brazil','british indian ocean territory','brunei darussalam','bulgaria','burkina faso','burundi','cabo verde','cambodia','cameroon','canada','cayman islands','central african republic','chad','chile','china','christmas island','cocos islands','colombia','comoros','democratic republic of the congo','congo','cook islands','costa rica','côte d\'ivoire','croatia','cuba','curaçao','cyprus','czechia','denmark','djibouti','dominica','dominican republic','ecuador','egypt','el salvador','equatorial guinea','eritrea','estonia','ethiopia','falkland islands','faroe islands','fiji','finland','france','french guiana','french polynesia','french southern territories','gabon','gambia','georgia','germany','ghana','gibraltar','greece','greenland','grenada','guadeloupe','guam','guatemala','guernsey','guinea','guinea-bissau','guyana','haiti','heard island and mcdonald islands','honduras','hong kong','hungary','iceland','india','indonesia','iran','iraq','ireland','isle of man','israel','italy','jamaica','japan','jersey','jordan','kazakhstan','kenya','kiribati','north korea','south korea','kuwait','kyrgyzstan','laos','latvia','lebanon','lesotho','liberia','libya','liechtenstein','lithuania','luxembourg','macao','macedonia','madagascar','malawi','malaysia','maldives','mali','malta','marshall islands','martinique','mauritania','mauritius','mayotte','mexico','micronesia','moldova','monaco','mongolia','montenegro','montserrat','morocco','mozambique','myanmar','namibia','nauru','nepal','netherlands','new caledonia','new zealand','nicaragua','niger','nigeria','niue','norfolk island','northern mariana islands','norway','oman','pakistan','palau','palestine','panama','papua new guinea','paraguay','peru','philippines','pitcairn','poland','portugal','puerto rico','qatar','réunion','romania','russia','rwanda','saint barthélemy','saint helena','ascension and tristan da cunha', 'Ascension and tristan da cunha','saint kitts and nevis','saint lucia','saint martin','saint pierre and miquelon','saint vincent and the grenadines','samoa','san marino','sao tome and principe','saudi arabia','senegal','serbia','seychelles','sierra leone','singapore','sint maarten','slovakia','slovenia','solomon islands','somalia','south africa','south georgia and the south sandwich islands','south sudan','spain','sri lanka','sudan','suriname','svalbard and jan mayen','swaziland','sweden','switzerland','syria','taiwan','tajikistan','tanzania','thailand','timor-leste','togo','tokelau','tonga','trinidad and tobago','tunisia','turkey','turkmenistan','turks and caicos islands','tuvalu','uganda','ukraine','united arab emirates','united kingdom','united states minor outlying islands','united states','uruguay','uzbekistan','vanuatu','venezuela','vatican city','vietnam','virgin islands (british)','virgin islands (us)','wallis and futuna','western sahara','yemen','zambia','zimbabwe','åland islands'],
2525
errorMessage : '',
2626
errorMessageKey: 'badCustomVal'
2727
});

test/form.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</div>
6969

7070
<div class="form-group">
71-
<label class="control-label" for="country-suggestions">Swedish county suggestions</label>
71+
<label class="control-label">Swedish county suggestions</label>
7272
<div>
7373
<div>
7474
<!-- Make sure error class "has-error" gets all the way up to .form-group -->
@@ -83,7 +83,7 @@
8383
data-validation="length date"
8484
data-validation-length="min5"
8585
data-validation-format="yyyy/mm/dd"
86-
data-suggestions="2014/01/15,2014/01/16,2014/01/17" />
86+
data-suggestions="2014/01/15, 2014/01/16,2014/01/17" />
8787
</div>
8888

8989
<div class="form-group">

test/logic.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ <h3>data-validation-depends-on</h3>
3535
type="text"
3636
name="country"
3737
data-validation="country"
38+
data-validation-optional="true"
3839
data-validation-error-msg="You have to answer with a country"
3940
autocomplete="off"
4041
/>
@@ -47,7 +48,7 @@ <h3>data-validation-depends-on</h3>
4748
name="state"
4849
data-validation="required"
4950
data-validation-depends-on="country"
50-
data-validation-depends-on-value="usa, canada"
51+
data-validation-depends-on-value="United states, canada"
5152
/>
5253
</div>
5354

test/test.html

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)