Changeset 8761

Show
Ignore:
Timestamp:
02/02/10 07:36:25 (2 years ago)
Author:
mbrevda
Message:

really closes #4021; fixed js for non legacy systems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7/fax/functions.inc.php

    r8759 r8761  
    347347       * playing the second 
    348348       */ 
    349       $js="$('.legacyemail').slideUp('400',function(){ 
    350             $('.faxdest').slideUp(); 
    351           })";  
    352       $html.='<td><input type="radio" name="faxenabled" value="false" CHECKED onclick="'.$js.'"/>No'; 
    353       $js="$('.legacyemail').slideUp('400',function(){ 
    354             $('.faxdetect').slideDown() 
    355           });"; 
    356       $html.='<input type="radio" name="faxenabled" value="true" '.($fax?'CHECKED':'').' onclick="'.$js.'"/>Yes'; 
     349      if($fax['legacy_email']===null){ 
     350        $jsno="$('.faxdetect').slideUp();";  
     351        $jsyes="$('.faxdetect').slideDown();"; 
     352      }else{ 
     353        $jsno="$('.faxdetect').slideUp();$('.legacyemail').slideUp();";  
     354        $jsyes="$('.legacyemail').slideUp('400',function(){ 
     355              $('.faxdetect').slideDown() 
     356            });"; 
     357        $jslegacy="$('.faxdest27').slideUp('400',function(){  
     358                $('.faxdetect, .legacyemail').not($('.faxdest27')).slideDown(); 
     359            });"; 
     360      } 
     361      $html.='<td><input type="radio" name="faxenabled" value="false" CHECKED onclick="'.$jsno.'"/>No'; 
     362      $html.='<input type="radio" name="faxenabled" value="true" '.($fax?'CHECKED':'').' onclick="'.$jsyes.'"/>Yes'; 
    357363      if($fax['legacy_email']!==null){ 
    358         $js="$('.faxdest27').slideUp('400',function(){  
    359               $('.faxdetect, .legacyemail').not($('.faxdest27')).slideDown(); 
    360           });"; 
    361         $html.='<input type="radio" name="faxenabled" value="legacy" CHECKED onclick="'.$js.'"/>Legacy'; 
     364        $html.='<input type="radio" name="faxenabled" value="legacy" CHECKED onclick="'.$jslegacy.'"/>Legacy'; 
    362365      } 
    363366      $html.='</td></tr>'; 

  • modules/branches/2.7/fax/module.xml

    r8760 r8761  
    22  <rawname>fax</rawname> 
    33  <name>Fax Configuration</name> 
    4   <version>2.7.0.4</version> 
     4  <version>2.7.0.5</version> 
    55  <publisher>Schmoozecom.com</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1212  <description>Adds configurations, options and GUI for inbound faxing</description> 
    1313  <changelog> 
     14    *2.7.0.5* #4021 
    1415    *2.7.0.4* #4021 
    1516    *2.7.0.3* #4020