[freeside-commits] branch FREESIDE_4_BRANCH updated. a345db7e645ff8c86e5e655fed3c3a66d53c4958

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  a345db7e645ff8c86e5e655fed3c3a66d53c4958 (commit)
      from  93099398e2d1e740daceb37969d295d0fbcd411c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a345db7e645ff8c86e5e655fed3c3a66d53c4958
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon May 22 19:19:02 2017 -0700

    fix DID selection dropdowns, RT#75901

diff --git a/httemplate/elements/select-areacode.html b/httemplate/elements/select-areacode.html
index 11b6188..e968322 100644
--- a/httemplate/elements/select-areacode.html
+++ b/httemplate/elements/select-areacode.html
@@ -21,7 +21,7 @@
     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;
 
@@ -29,16 +29,16 @@
 
       var reply = JSON.parse(areacodes);
       // blank the current areacode
-      $('#<% $opt{prefix} %>areacode').empty;
+      $('#<% $opt{prefix} %>areacode').empty();
 
       // blank the current exchange too
-      $('#<% $opt{prefix} %>exchange').empty;
-      jopt( $('#<% $opt{prefix} %>exchnage'), '', 'Select city / exchange' );
+      $('#<% $opt{prefix} %>exchange').empty();
+      jopt( $('#<% $opt{prefix} %>exchange'), '', 'Select city / exchange' );
 
       // blank the current phonenum too
-      $('#<% $opt{prefix} %>phonenum').empty;
+      $('#<% $opt{prefix} %>phonenum').empty();
       if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ) {
-        jopt($('<% $opt{'prefix'} %>phonenum'), '', 'Select phone number');
+        jopt($('#<% $opt{'prefix'} %>phonenum'), '', 'Select phone number');
       }
 
 %     if ($opt{empty}) {
diff --git a/httemplate/elements/select-exchange.html b/httemplate/elements/select-exchange.html
index a820146..9d6c390 100644
--- a/httemplate/elements/select-exchange.html
+++ b/httemplate/elements/select-exchange.html
@@ -20,7 +20,7 @@
     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;
 
@@ -28,10 +28,10 @@
 
       var reply = JSON.parse(exchanges);
       // blank the current exchange
-      $('#<% $opt{prefix} %>exchange').empty;
+      $('#<% $opt{prefix} %>exchange').empty();
 
       // blank the current phonenum too
-      $('#<% $opt{prefix} %>phonenum').empty;
+      $('#<% $opt{prefix} %>phonenum').empty();
       if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ) {
         jopt($('#<% $opt{'prefix'} %>phonenum'), '', 'Select phone number');
       }
diff --git a/httemplate/elements/select-phonenum.html b/httemplate/elements/select-phonenum.html
index c9254ad..f0ff03c 100644
--- a/httemplate/elements/select-phonenum.html
+++ b/httemplate/elements/select-phonenum.html
@@ -44,8 +44,8 @@ passing the exchange (or region) and
 
   function <% $opt{'prefix'} %><% $previous %>_changed(what, callback) {
 
-    what.form.<% $opt{'prefix'} %>phonenum.disabled = 'disabled';
-    what.form.<% $opt{'prefix'} %>phonenum.style.display = 'none';
+    $('#<% $opt{'prefix'} %>phonenum').prop('disabled', true);
+    $('#<% $opt{'prefix'} %>phonenum').css('display', 'none');
     var phonenumwait = document.getElementById('<% $opt{'prefix'} %>phonenumwait');
     phonenumwait.style.display = 'inline';
     var phonenumerror = document.getElementById('<% $opt{'prefix'} %>phonenumerror');
@@ -57,7 +57,7 @@ passing the exchange (or region) and
 
       var reply = JSON.parse(phonenums);
       // blank the current phonenum
-      $('#<% $opt{prefix} %>phonenum').empty;
+      $('#<% $opt{prefix} %>phonenum').empty();
 
 %     if ($opt{empty}) {
         if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ){
@@ -76,12 +76,12 @@ passing the exchange (or region) and
 
       //var phonenumFormLabel = document.getElementById('<% $opt{'prefix'} %>phonenumlabel');
 
-      what.form.<% $opt{'prefix'} %>phonenum.disabled = '';
+    $('#<% $opt{'prefix'} %>phonenum').prop('disabled', false);
 
       phonenumwait.style.display = 'none';
       if ( phonenumArray.length >= 1 ) {
-        what.form.<% $opt{'prefix'} %>phonenum.disabled = '';
-        what.form.<% $opt{'prefix'} %>phonenum.style.display = '';
+        $('#<% $opt{'prefix'} %>phonenum').prop('disabled', false);
+        $('#<% $opt{'prefix'} %>phonenum').css('display', '');
       } else {
         var phonenumerror = document.getElementById('<% $opt{'prefix'} %>phonenumerror');
         phonenumerror.style.display = 'inline';
@@ -129,7 +129,7 @@ passing the exchange (or region) and
 	what = document.getElementById('<% $opt{prefix} %>phonenum');
 
 	// blank the current phonenum
-        $('#<% $opt{prefix} %>phonenum').empty;
+        $('#<% $opt{prefix} %>phonenum').empty();
 
 %     if ($opt{empty}) {
         jopt($('#<% $opt{'prefix'} %>phonenum'), '', '<% $opt{empty} %>');
@@ -144,11 +144,11 @@ passing the exchange (or region) and
           jopt($('#<% $opt{'prefix'} %>phonenum'), phonenumArray[s], phonenumLabel);
       }
 
-      what.form.<% $opt{'prefix'} %>phonenum.disabled = '';
+      $('#<% $opt{'prefix'} %>phonenum').prop('disabled', false);
 
       if ( phonenumArray.length >= 1 ) {
-        what.form.<% $opt{'prefix'} %>phonenum.disabled = '';
-        what.form.<% $opt{'prefix'} %>phonenum.style.display = '';
+        $('#<% $opt{'prefix'} %>phonenum').prop('disabled', false);
+        $('#<% $opt{'prefix'} %>phonenum').css('display', '');
       } 
 
     }

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/select-areacode.html |   12 ++++++------
 httemplate/elements/select-exchange.html |    6 +++---
 httemplate/elements/select-phonenum.html |   20 ++++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)