From cb2a5cbe1fb5f0b3fb8bea31f310f5805e5667c5 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 22 May 2017 18:33:28 -0700
Subject: fix DID selection dropdowns, RT#75901

---
 httemplate/elements/select-exchange.html | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'httemplate/elements/select-exchange.html')

diff --git a/httemplate/elements/select-exchange.html b/httemplate/elements/select-exchange.html
index 33def31b9..a8201468f 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) {
@@ -29,17 +28,16 @@
 
       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
@@ -48,7 +46,7 @@
           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';
@@ -82,7 +80,12 @@
 
 <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>
 
-- 
cgit v1.2.1