From 75e14bbf8681f164c5a9f871f010d7ebfd7b1205 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 7 Dec 2013 22:45:57 -0800
Subject: [PATCH] CRM-13933 - Refactor out jquery.chainedSelects

---
 CRM/Contact/Form/Search/Simple.php    |   2 +-
 CRM/Core/BAO/UFGroup.php              |   2 +-
 CRM/Core/Page/AJAX/Location.php       |  36 ++++-----
 templates/CRM/common/jquery.files.tpl |   2 -
 templates/CRM/common/stateCountry.tpl | 105 +++++++++-----------------
 5 files changed, 52 insertions(+), 95 deletions(-)

diff --git a/CRM/Contact/Form/Search/Simple.php b/CRM/Contact/Form/Search/Simple.php
index d378f7abf1..7c0efacbc1 100644
--- a/CRM/Contact/Form/Search/Simple.php
+++ b/CRM/Contact/Form/Search/Simple.php
@@ -46,7 +46,7 @@ class CRM_Contact_Form_Search_Simple extends CRM_Core_Form {
   }
 
   public function buildQuickForm() {
-    $config = CRM_Core_Config::singleton();
+    CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'packages/jquery/plugins/jquery.chainedSelects.js', 0, 'html-header', FALSE);
 
     $this->add('select',
       'country_id',
diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index 1f8a12d1fe..cb6ab8d15a 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -1803,7 +1803,7 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
       if ($addressOptions['county']) {
         $form->add('select', $name, $title,
           array(
-            '' => ts('- select state -')), $required
+            '' => ts('(choose state first)')), $required
         );
       }
     }
diff --git a/CRM/Core/Page/AJAX/Location.php b/CRM/Core/Page/AJAX/Location.php
index 0d21c1b778..150cffc5c0 100644
--- a/CRM/Core/Page/AJAX/Location.php
+++ b/CRM/Core/Page/AJAX/Location.php
@@ -219,21 +219,17 @@ class CRM_Core_Page_AJAX_Location {
     CRM_Utils_System::civiExit();
   }
 
-  static function jqState($config) {
-    if (
-      !isset($_GET['_value']) ||
-      empty($_GET['_value'])
-    ) {
+  static function jqState() {
+    if (empty($_GET['_value'])) {
       CRM_Utils_System::civiExit();
     }
 
     $result = CRM_Core_PseudoConstant::stateProvinceForCountry($_GET['_value']);
 
-    $elements = array(
-      array('name' => ts('- select a state -'),
-        'value' => '',
-      )
-    );
+    $elements = array(array(
+      'name' => $result ? ts('- select a state -') : ts('- N/A -'),
+      'value' => '',
+    ));
     foreach ($result as $id => $name) {
       $elements[] = array(
         'name' => $name,
@@ -245,31 +241,25 @@ class CRM_Core_Page_AJAX_Location {
     CRM_Utils_System::civiExit();
   }
 
-  static function jqCounty($config) {
-    if (CRM_Utils_System::isNull($_GET['_value'])) {
+  static function jqCounty() {
+    if (!isset($_GET['_value']) || CRM_Utils_System::isNull($_GET['_value'])) {
       $elements = array(
-        array('name' => ts('- select state -'), 'value' => '')
+        array('name' => ts('(choose state first)'), 'value' => '')
       );
     }
     else {
       $result = CRM_Core_PseudoConstant::countyForState($_GET['_value']);
 
-      $elements = array(
-        array('name' => ts('- select -'), 'value' => '')
-      );
+      $elements = array(array(
+        'name' => $result ? ts('- select -') : ts('- N/A -'),
+        'value' => '',
+      ));
       foreach ($result as $id => $name) {
         $elements[] = array(
           'name' => $name,
           'value' => $id,
         );
       }
-
-      if ($elements == array(
-        array('name' => ts('- select -'), 'value' => ''))) {
-        $elements = array(
-          array('name' => ts('- no counties -'), 'value' => '')
-        );
-      }
     }
 
     echo json_encode($elements);
diff --git a/templates/CRM/common/jquery.files.tpl b/templates/CRM/common/jquery.files.tpl
index e76cfd287c..2d41af8445 100644
--- a/templates/CRM/common/jquery.files.tpl
+++ b/templates/CRM/common/jquery.files.tpl
@@ -33,8 +33,6 @@ packages/jquery/css/jquery.autocomplete.css
 packages/jquery/plugins/jquery.menu.pack.js
 packages/jquery/css/menu.css
 
-packages/jquery/plugins/jquery.chainedSelects.js
-
 packages/jquery/plugins/jquery.tableHeader.js
 
 packages/jquery/plugins/jquery.textarearesizer.js
diff --git a/templates/CRM/common/stateCountry.tpl b/templates/CRM/common/stateCountry.tpl
index 2f9d211ec7..adf578eebc 100644
--- a/templates/CRM/common/stateCountry.tpl
+++ b/templates/CRM/common/stateCountry.tpl
@@ -24,75 +24,44 @@
  +--------------------------------------------------------------------+
 *}
 {if $config->stateCountryMap}
-<script language="javaScript" type="text/javascript">
-{foreach from=$config->stateCountryMap item=stateCountryMap}
-  {if $stateCountryMap.country && $stateCountryMap.state_province}
-    {literal}
-    cj(function() {
-        countryID       = {/literal}"{$stateCountryMap.country}"{literal}
-        // sometimes we name != id, hence if element does not exists
-        // fetch the id
-        if ( cj( '#' + countryID ).length == 0 ) {
-          countryID = cj( 'select[name="' + countryID + '"]' ).prop('id');
-        }
-
-        stateProvinceID = {/literal}"{$stateCountryMap.state_province}"{literal}
-        if ( cj( '#' + stateProvinceID ).length == 0 ) {
-          stateProvinceID = cj( 'select[name="' + stateProvinceID + '"]' ).prop('id');
-        }
-
-        callbackURL     = {/literal}"{crmURL p='civicrm/ajax/jqState' h=0}"{literal}
-
-        cj( '#' + countryID ).chainSelect(
-          '#' + stateProvinceID,
-          callbackURL,
-          {
-            before : function (target) {
-              if (typeof(setdefault) === "undefined") { setdefault = new Array(); }
-              targetid = cj(target).attr("id");
-              eval('setdefault[targetid] = cj(target).val()');
-            },
-            after : function(target) {
-              targetid = cj(target).attr("id");
-              cj(target).val(setdefault[targetid]);
-            }
-          }
-        );
-    });
+<script type="text/javascript">
+  {literal}
+  cj(function($) {
+    function chainSelect(e) {
+      var val = e.data.target.val();
+      var placeholder = $(this).val() ? "{/literal}{ts escape='js'}Loading{/ts}{literal}..." : e.data.placeholder;
+      e.data.target.html('<option value="">' + placeholder + '</option>');
+      if ($(this).val()) {
+        $.getJSON(e.data.callback, {_value: $(this).val()}, function(data) {
+          var options = '';
+          $.each(data, function() {
+            options += '<option value="' + this.value + '">' + this.name + '</option>';
+          });
+          e.data.target.html(options).val(val).trigger('change');
+        });
+      } else {
+        e.data.target.trigger('change');
+      }
+    }
     {/literal}
-  {/if}
-
-  {if $stateCountryMap.state_province && $stateCountryMap.county}
+    {foreach from=$config->stateCountryMap item=stateCountryMap}
+      {if $stateCountryMap.country && $stateCountryMap.state_province}
+        $('select[name="{$stateCountryMap.country}"]').on('change', {literal}{
+          callback: CRM.url('civicrm/ajax/jqState'),
+          target: $('select[name="{/literal}{$stateCountryMap.state_province}{literal}"]'),
+          placeholder: "{/literal}{ts escape='js'}(choose country first){/ts}{literal}"
+        }{/literal}, chainSelect);
+      {/if}
+      {if $stateCountryMap.state_province && $stateCountryMap.county}
+        $('select[name="{$stateCountryMap.state_province}"]').on('change', {literal}{
+          callback: CRM.url('civicrm/ajax/jqCounty'),
+          target: $('select[name="{/literal}{$stateCountryMap.county}{literal}"]'),
+          placeholder: "{/literal}{ts escape='js'}(choose state first){/ts}{literal}"
+        }{/literal}, chainSelect);
+      {/if}
+    {/foreach}
     {literal}
-    cj(function() {
-        stateProvinceID = {/literal}"{$stateCountryMap.state_province}"{literal}
-        if ( cj( '#' + stateProvinceID ).length == 0 ) {
-          stateProvinceID = cj( 'select[name="' + stateProvinceID + '"]' ).prop('id');
-        }
-
-        countyID       = {/literal}"{$stateCountryMap.county}"{literal}
-        if ( cj( '#' + countyID ).length == 0 ) {
-          countyID = cj( 'select[name="' + countyID + '"]' ).prop('id');
-        }
-
-        callbackURL     = {/literal}"{crmURL p='civicrm/ajax/jqCounty' h=0}"{literal}
-
-        cj( '#' + stateProvinceID ).chainSelect( '#' + countyID, callbackURL,
-          {
-            before : function (target) {
-              if (typeof(setdefault) === "undefined") { setdefault = new Array(); }
-              targetid = cj(target).attr("id");
-              eval('setdefault[targetid] = cj(target).val()');
-            },
-            after : function(target) {
-              targetid = cj(target).attr("id");
-              cj(target).val(setdefault[targetid]);
-            }
-          }
-        );
-    });
-    {/literal}
-  {/if}
-{/foreach}
+  });
+  {/literal}
 </script>
 {/if}
-- 
2.25.1