X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-areacode.html;h=e968322793f95294243edd390907985040cccfba;hb=2554b11e48a7ec4567bf89f9a48f7a83ec925eea;hp=453205c029b0dd90af0dd3c48ff852b0e202fe79;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/httemplate/elements/select-areacode.html b/httemplate/elements/select-areacode.html
index 453205c02..e96832279 100644
--- a/httemplate/elements/select-areacode.html
+++ b/httemplate/elements/select-areacode.html
@@ -6,10 +6,9 @@
 
 <SCRIPT TYPE="text/javascript">
 
-  function opt(what,value,text) {
+  function jopt(what,value,text) {
     var optionName = new Option(text, value, false, false);
-    var length = what.length;
-    what.options[length] = optionName;
+    what.append(optionName);
   }
 
   function <% $opt{'state_prefix'} %>state_changed(what, callback) {
@@ -17,40 +16,42 @@
     what.form.<% $opt{'prefix'} %>areacode.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>areacode.style.display = 'none';
     var areacodewait = document.getElementById('<% $opt{'prefix'} %>areacodewait');
-    areacodewait.style.display = '';
+    areacodewait.style.display = 'inline';
     var areacodeerror = document.getElementById('<% $opt{'prefix'} %>areacodeerror');
     areacodeerror.style.display = 'none';
 
     what.form.<% $opt{'prefix'} %>exchange.disabled = 'disabled';
-    what.form.<% $opt{'prefix'} %>phonenum.disabled = 'disabled';
+    $('#<% $opt{'prefix'} %>phonenum').prop('disabled', true);
 
     var state = what.options[what.selectedIndex].value;
 
     function <% $opt{'prefix'} %>update_areacodes(areacodes) {
 
+      var reply = JSON.parse(areacodes);
       // blank the current areacode
-      for ( var i = what.form.<% $opt{'prefix'} %>areacode.length; i >= 0; i-- )
-          what.form.<% $opt{'prefix'} %>areacode.options[i] = null;
+      $('#<% $opt{prefix} %>areacode').empty();
+
       // blank the current exchange too
-      for ( var i = what.form.<% $opt{'prefix'} %>exchange.length; i >= 0; i-- )
-          what.form.<% $opt{'prefix'} %>exchange.options[i] = null;
-      opt(what.form.<% $opt{'prefix'} %>exchange, '', 'Select city / exchange');
+      $('#<% $opt{prefix} %>exchange').empty();
+      jopt( $('#<% $opt{prefix} %>exchange'), '', 'Select city / exchange' );
+
       // blank the current phonenum too
-      for ( var i = what.form.<% $opt{'prefix'} %>phonenum.length; i >= 0; i-- )
-          what.form.<% $opt{'prefix'} %>phonenum.options[i] = null;
-      opt(what.form.<% $opt{'prefix'} %>phonenum, '', 'Select phone number');
+      $('#<% $opt{prefix} %>phonenum').empty();
+      if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ) {
+        jopt($('#<% $opt{'prefix'} %>phonenum'), '', 'Select phone number');
+      }
 
 %     if ($opt{empty}) {
-        opt(what.form.<% $opt{'prefix'} %>areacode, '', '<% $opt{empty} %>');
+        jopt($('#<% $opt{'prefix'} %>areacode'), '', '<% $opt{empty} %>');
 %     }
 
       // add the new areacodes
-      var areacodeArray = eval('(' + areacodes + ')' );
+      var areacodeArray = reply.areacodes;
       for ( var s = 0; s < areacodeArray.length; s++ ) {
           var areacodeLabel = areacodeArray[s];
           if ( areacodeLabel == "" )
               areacodeLabel = '(n/a)';
-          opt(what.form.<% $opt{'prefix'} %>areacode, areacodeArray[s], areacodeLabel);
+          jopt($('#<% $opt{'prefix'} %>areacode'), areacodeArray[s], areacodeLabel);
       }
 
       areacodewait.style.display = 'none';
@@ -59,7 +60,12 @@
         what.form.<% $opt{'prefix'} %>areacode.style.display = '';
       } else {
         var areacodeerror = document.getElementById('<% $opt{'prefix'} %>areacodeerror');
-        areacodeerror.style.display = '';
+        areacodeerror.style.display = 'inline';
+        if ( reply.error ) {
+          areacodeerror.textContent = reply.error;
+        } else {
+          areacodeerror.textContent = 'Select a different state';
+        }
       }
 
       //run the callback
@@ -76,9 +82,14 @@
 
 <DIV ID="areacodewait" STYLE="display:none"><IMG SRC="<%$fsurl%>images/wait-orange.gif"> <B>Finding area codes</B></DIV>
 
-<DIV ID="areacodeerror" STYLE="display:none"><IMG SRC="<%$fsurl%>images/cross.png"> <B>Select a different state</B></DIV>
+<DIV ID="areacodeerror" STYLE="display:none; font-weight: bold"><IMG SRC="<%$fsurl%>images/cross.png"></DIV>
 
-<SELECT NAME="<% $opt{'prefix'} %>areacode" onChange="<% $opt{'prefix'} %>areacode_changed(this); <% $opt{'onchange'} %>" <% $opt{'disabled'} %>>
+<SELECT
+  ID       = "<% $opt{prefix} %>areacode"
+  NAME     = "<% $opt{prefix} %>areacode"
+  onChange = "<% $opt{prefix} %>areacode_changed(this); <% $opt{onchange} %>"
+  <% $opt{disabled} %>
+>
   <OPTION VALUE="">Select area code</OPTION>
 </SELECT>