X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-exchange.html;h=9d6c390dafac5b427d00fc1f010ef8902a41d0d7;hb=560af69840e7e3fcebf65d5d56ca4efc0851efec;hp=9e4b5ce9797ea84874985dec04009ee8a7b16f5a;hpb=424ae31847c4fd44e6ed55ec275c8e668c7d2b51;p=freeside.git

diff --git a/httemplate/elements/select-exchange.html b/httemplate/elements/select-exchange.html
index 9e4b5ce97..9d6c390da 100644
--- a/httemplate/elements/select-exchange.html
+++ b/httemplate/elements/select-exchange.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{'prefix'} %>areacode_changed(what, callback) {
@@ -17,37 +16,37 @@
     what.form.<% $opt{'prefix'} %>exchange.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>exchange.style.display = 'none';
     var exchangewait = document.getElementById('<% $opt{'prefix'} %>exchangewait');
-    exchangewait.style.display = '';
+    exchangewait.style.display = 'inline';
     var exchangeerror = document.getElementById('<% $opt{'prefix'} %>exchangeerror');
     exchangeerror.style.display = 'none';
 
-    what.form.<% $opt{'prefix'} %>phonenum.disabled = 'disabled';
+    $('#<% $opt{'prefix'} %>phonenum').prop('disabled', true);
 
     areacode = what.options[what.selectedIndex].value;
 
     function <% $opt{'prefix'} %>update_exchanges(exchanges) {
 
+      var reply = JSON.parse(exchanges);
       // blank the current exchange
-      for ( var i = what.form.<% $opt{'prefix'} %>exchange.length; i >= 0; i-- )
-          what.form.<% $opt{'prefix'} %>exchange.options[i] = null;
+      $('#<% $opt{prefix} %>exchange').empty();
+
       // 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{prefix} %>phonenum').empty();
       if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ) {
-        opt(what.form.<% $opt{'prefix'} %>phonenum, '', 'Select phone number');
+        jopt($('#<% $opt{'prefix'} %>phonenum'), '', 'Select phone number');
       }
 
 %     if ($opt{empty}) {
-        opt(what.form.<% $opt{'prefix'} %>exchange, '', '<% $opt{empty} %>');
+        jopt($('#<% $opt{'prefix'} %>exchange'), '', '<% $opt{empty} %>');
 %     }
 
       // add the new exchanges
-      var exchangeArray = eval('(' + exchanges + ')' );
+      var exchangeArray = reply.exchanges;
       for ( var s = 0; s < exchangeArray.length; s++ ) {
           var exchangeLabel = exchangeArray[s];
           if ( exchangeLabel == "" )
               exchangeLabel = '(n/a)';
-          opt(what.form.<% $opt{'prefix'} %>exchange, exchangeArray[s], exchangeLabel);
+          jopt($('#<% $opt{'prefix'} %>exchange'), exchangeArray[s], exchangeLabel);
       }
 
       exchangewait.style.display = 'none';
@@ -56,7 +55,13 @@
         what.form.<% $opt{'prefix'} %>exchange.style.display = '';
       } else {
         var exchangeerror = document.getElementById('<% $opt{'prefix'} %>exchangeerror');
-        exchangeerror.style.display = '';
+        exchangeerror.style.display = 'inline';
+        if ( reply.error ) {
+          exchangeerror.textContent = reply.error;
+        } else {
+          exchangeerror.textContent = 'Select a different area code';
+        }
+
       }
 
       //run the callback
@@ -73,9 +78,14 @@
 
 <DIV ID="exchangewait" STYLE="display:none"><IMG SRC="<%$fsurl%>images/wait-orange.gif"> <B>Finding cities / exchanges</B></DIV>
 
-<DIV ID="exchangeerror" STYLE="display:none"><IMG SRC="<%$fsurl%>images/cross.png"> <B>Select a different area code</B></DIV>
+<DIV ID="exchangeerror" STYLE="display:none; font-weight: bold"><IMG SRC="<%$fsurl%>images/cross.png"></DIV>
 
-<SELECT NAME="<% $opt{'prefix'} %>exchange" onChange="<% $opt{'prefix'} %>exchange_changed(this); <% $opt{'onchange'} %>" <% $opt{'disabled'} %>>
+<SELECT
+  ID       = "<% $opt{prefix} %>exchange"
+  NAME     = "<% $opt{prefix} %>exchange"
+  onChange = "<% $opt{prefix} %>exchange_changed(this); <% $opt{onchange} %>"
+  <% $opt{disabled} %>
+>
   <OPTION VALUE="">Select city / exchange</OPTION>
 </SELECT>