Ignore:
Timestamp:
04/30/10 17:21:44 (11 years ago)
Author:
alexandrecorreia
Message:

Ticket #986 - Correcao para compatibilizar o carregamento do script para o branch

Location:
sandbox/jabberit_messenger/trophy_expresso
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sandbox/jabberit_messenger/trophy_expresso/inc/jabberit_acl.inc.php

    r2670 r2678  
    5858                $js .= "var theme_jabberit='".$theme."';"; 
    5959 
    60                 //echo "<script type='text/javascript'>".$js."</script>"; 
    61                 //echo "<script type='text/javascript' src='".$webserver_url . "js/loadIM.js'></script>"; 
    62                 //echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>"; 
     60                echo "<script type='text/javascript'>".$js."</script>"; 
     61                echo "<script type='text/javascript' src='".$webserver_url . "js/jscode/loadIM.js'></script>"; 
     62                echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>"; 
    6363                 
    64                 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= "<script type='text/javascript'>".$js."</script>"; 
    65                 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'loadIM', 'jmessenger' ); 
    66                 $GLOBALS['phpgw_info']['flags']['java_script'] .= "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>"; 
    67                  
    68  
    6964                break; 
    7065        } 
  • sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

    r2672 r2678  
    647647                        _message.removeChild( scripts[ i-- ] ); 
    648648                 
    649                 _message.innerHTML = _message.innerHTML.trim( ); 
     649                _message.innerHTML = _message.innerHTML.replace(/^\s+|\s+$|^\n|\n$/g,""); 
    650650 
    651651                if ( _message.hasChildNodes( ) ) 
Note: See TracChangeset for help on using the changeset viewer.