Changeset 2678 for sandbox/jabberit_messenger

Timestamp:

04/30/10 17:21:44 (14 years ago)

Author:

alexandrecorreia

Message:

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

Location:

sandbox/jabberit_messenger/trophy_expresso

Files:

• inc/jabberit_acl.inc.php (modified) (1 diff)
• js/trophyim.js (modified) (1 diff)

sandbox/jabberit_messenger/trophy_expresso/inc/jabberit_acl.inc.php

@@ -58 +58 @@
                 $js .= "var theme_jabberit='".$theme."';";
 
-                //echo "<script type='text/javascript'>".$js."</script>";
-                //echo "<script type='text/javascript' src='".$webserver_url . "js/loadIM.js'></script>";
-                //echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>";
+                echo "<script type='text/javascript'>".$js."</script>";
+                echo "<script type='text/javascript' src='".$webserver_url . "js/jscode/loadIM.js'></script>";
+                echo "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>";
                 
-                $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= "<script type='text/javascript'>".$js."</script>";
-                $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'loadIM', 'jmessenger' );
-                $GLOBALS['phpgw_info']['flags']['java_script'] .= "<script type='text/javascript'> var loadscript = new LoadIM('".$fullName."'); </script>";
-                
-
                 break;
         }

sandbox/jabberit_messenger/trophy_expresso/js/trophyim.js

@@ -647 +647 @@
                         _message.removeChild( scripts[ i-- ] );
                 
-                _message.innerHTML = _message.innerHTML.trim( );
+                _message.innerHTML = _message.innerHTML.replace(/^\s+|\s+$|^\n|\n$/g,"");
 
                 if ( _message.hasChildNodes( ) )