Merge remote-tracking branch 'josh/master'

jamesds · Jan 6, 2012 · 1cc764c · 1cc764c
2 parents e9fe529 + 29ff9ec
commit 1cc764c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/country-select.rb b/lib/country-select.rb
@@ -20,6 +20,10 @@ def country_options_for_select(selected = nil, priority_countries = nil)
           end
           country_options += options_for_select(priority_countries, selected)
           country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
+          # prevents selected from being included twice in the HTML which causes
+          # some browsers to select the second selected option (not priority)
+          # which makes it harder to select an alternative priority country
+          selected=nil if priority_countries.include?(selected)
         end
 
         return country_options + options_for_select(COUNTRIES, selected)