[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.0rc4-31-g1334022

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  13340221d6be810a758822f5c95d022fc3e64c58 (commit)
      from  94891643aa410efbed473902bb129a5095653547 (commit)

Summary of changes:
 share/html/NoAuth/js/util.js        |    3 ++-
 share/html/Ticket/Elements/UpdateCc |   24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit 13340221d6be810a758822f5c95d022fc3e64c58
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jan 31 16:04:22 2011 -0500

    jQuery can't select ids which contain "@" or ".", like email addresses have
    
    This restores the functionality of "clicking one-time cc checkboxes
    adds them to the textarea."  It was previously falling back to the
    non-JS version.

diff --git a/share/html/NoAuth/js/util.js b/share/html/NoAuth/js/util.js
index 6c926f6..ef29240 100644
--- a/share/html/NoAuth/js/util.js
+++ b/share/html/NoAuth/js/util.js
@@ -186,7 +186,7 @@ function checkAllObjects()
 }
 
 function checkboxToInput(target,checkbox,val){    
-    var tar = jQuery('#'+target);
+    var tar = jQuery('#' + target);
     var box = jQuery('#' + checkbox);
     if(box.attr('checked')){
         if (tar.val()==''){
@@ -200,6 +200,7 @@ function checkboxToInput(target,checkbox,val){
         tar.val(tar.val().replace(val+', ',''));
         tar.val(tar.val().replace(val,''));
     }
+    jQuery('#UpdateIgnoreAddressCheckboxes').val(true);
 }
 
 // ahah for back compatibility as plugins may still use it
diff --git a/share/html/Ticket/Elements/UpdateCc b/share/html/Ticket/Elements/UpdateCc
index ba133ef..e8363c5 100644
--- a/share/html/Ticket/Elements/UpdateCc
+++ b/share/html/Ticket/Elements/UpdateCc
@@ -55,13 +55,16 @@
 <i class="label">(<&|/l&>check to add</&>)</i>
 %}
 %foreach my $addr ( @one_time_Ccs ) {
-<input 
-id="UpdateCc-<%$addr%>" 
-name="UpdateCc-<%$addr%>" 
-    type="checkbox" 
+% my $cleanid = $addr;
+% $cleanid =~ s/\W//g;
+<input
+    id="UpdateCc-<%$cleanid%>"
+    name="UpdateCc-<%$cleanid%>"
+    class="onetime onetimecc"
+    type="checkbox"
 % my $clean_addr = $txn_addresses{$addr}->format;
 % $clean_addr =~ s/'/\\'/g;
-    onClick="checkboxToInput('UpdateCc', 'UpdateCc-<%$addr%>','<%$clean_addr%>' ); $(UpdateIgnoreAddressCheckboxes).value=1"
+    onClick="checkboxToInput('UpdateCc', 'UpdateCc-<%$cleanid%>','<%$clean_addr%>' );"
     <% $ARGS{'UpdateCc-'.$addr} ? 'checked="checked"' : ''%> > <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
 %}
 </td></tr>
@@ -71,12 +74,15 @@ name="UpdateCc-<%$addr%>"
 %}
 %foreach my $addr ( @one_time_Ccs ) {
 <input
-    id="UpdateBcc-<%$addr%>"
-    name="UpdateBcc-<%$addr%>"
-    type="checkbox" 
+% my $cleanid = $addr;
+% $cleanid =~ s/\W//g;
+    id="UpdateBcc-<%$cleanid%>"
+    name="UpdateBcc-<%$cleanid%>"
+    class="onetime onetimebcc"
+    type="checkbox"
 % my $clean_addr = $txn_addresses{$addr}->format;
 % $clean_addr =~ s/'/\\'/g;
-    onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$addr%>','<%$clean_addr%>' ); $(UpdateIgnoreAddressCheckboxes).value=1"
+    onClick="checkboxToInput('UpdateBcc', 'UpdateBcc-<%$cleanid%>','<%$clean_addr%>' );"
         <% $ARGS{'UpdateBcc-'.$addr} ? 'checked="checked"' : ''%>> 
 <& /Elements/ShowUser, Address => $txn_addresses{$addr}&>
 %}

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