effective_addresses 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5688457f9a6889758119802194fa1be36cc5452
-  data.tar.gz: 85af035d0d760ee4e4e997bc8db4611d500d9464
+  metadata.gz: e2a0de702ce06b137ff76dd3369442ddf9ba5f94
+  data.tar.gz: 698755ab5f757fcbb8ee8c1d481b8e5df0bf238c
 SHA512:
-  metadata.gz: c357eead61b53be0d8a0cb5a40d560a9ba76c707fec9d5ca0bd0d2dc6964b2317d8cb47fe33870617f11e1507ca0a647b81bdbccc7b18a40c1ac6eca8a6feaf4
-  data.tar.gz: 20bc9eed1de75eb80069270b242810f43c71097388119a8082358ebdab1b926f2fe6dc08feb2324cc72bcf513b5cc630b092165c3ccd255f469805746b914f41
+  metadata.gz: 5cb549e5323b92b3b312d9ca9b33e66d7959a4f9b7d7b628f384522bf8a8405c1f8ac3f845fe2f65844e49a94d558d70223beda6e311524d380c6b2bfe08c005
+  data.tar.gz: 236e4f110bc5956d46b1ba0c9ad9fd0ed0732ff74995631b630b38ba33ba9c3d0989535f8ea1af280247fa4b0c885b427fee308706f056facdcef94d2d18c71a

data/app/assets/javascripts/effective_addresses/address_fields.js.coffee

@@ -1,20 +1,37 @@
-$(document).on 'change', "select[data-effective-address-country]", (event) ->
-  country_code = $(this).val()
-  uuid = $(this).data('effective-address-country')
-  nested_fields = $(this).closest('.nested-fields')
-  form = $(this).closest('form')
+loadSubregions = ($countrySelect) ->
+  $.each $countrySelect, (index, countrySelector) ->
+    $particularCountrySelect = $(countrySelector)
+    countryCode = $particularCountrySelect.val()
+    uuid = $particularCountrySelect.data('effective-address-country')
 
-  # clear postal_code values on country change
-  (nested_fields || form).find("input[data-effective-address-postal-code='#{uuid}']").val('')
+    $nestedFields = $particularCountrySelect.closest('.nested-fields')
+    $form = $particularCountrySelect.closest('form')
 
-  # load state options
-  url = "/addresses/subregions/#{country_code}"
-  state_select = (nested_fields || form).find("select[data-effective-address-state='#{uuid}']").first()
+    $container = if $nestedFields.length == 0 then $form else $nestedFields
 
-  if country_code.length == 0
-    state_select.prop('disabled', true).addClass('disabled').parent('.form-group').addClass('disabled')
-    state_select.html('<option value="">Please choose a country first</option>')
-  else
-    state_select.prop('disabled', false).removeClass('disabled').parent('.form-group').removeClass('disabled')
-    state_select.find('option').first().text('loading...')
-    state_select.load(url)
+    # clear postal_code values on country change
+    $container.find("input[data-effective-address-postal-code='#{uuid}']").val('')
+
+    # load state options
+    url = "/addresses/subregions/#{countryCode}"
+    $stateSelect = $container.find("select[data-effective-address-state='#{uuid}']:first")
+
+    if countryCode.length == 0
+      $stateSelect.prop('disabled', true).addClass('disabled').parent('.form-group').addClass('disabled')
+      $stateSelect.html('<option value="">Please choose a country first</option>')
+    else
+      $stateSelect.removeProp('disabled').removeClass('disabled').parent('.form-group').removeClass('disabled')
+      $stateSelect.find('option').first().text('loading...')
+      $stateSelect.load url, ->
+        stateSelectAvailable = $(@).find('option:last').val().length > 0
+        if stateSelectAvailable
+          $(@).prop('required', true)
+          $(@).removeProp('disabled')
+        else
+          $(@).removeProp('required')
+          $(@).prop('disabled', true)
+
+$(document).on 'change', 'select[data-effective-address-country]', -> loadSubregions($(@))
+
+$ -> loadSubregions($('select[data-effective-address-country]'))
+$(document).on 'page:change', -> loadSubregions($('select[data-effective-address-country]'))

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails