Changeset 2603 for trunk/expressoMail1_2/index.php

Timestamp:

04/20/10 11:58:37 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas causados por javascripts inseridos dentro de tags.

File:

• trunk/expressoMail1_2/index.php (modified) (2 diffs)

trunk/expressoMail1_2/index.php

@@ -161 +161 @@
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'DropDownContacts', 'expressoMail1_2' );
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'InfoContact', 'expressoMail1_2' );
-$GLOBALS['phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' );
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'local_messages', 'expressoMail1_2' );
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'messages_controller', 'expressoMail1_2' );
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'rich_text_editor', 'expressoMail1_2' );
 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' );
+$GLOBALS['phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' );
 
 if ( $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_shortcuts' ] )
@@ -194 +194 @@
 $script .= '    expresso.connector.updateVersion = "'. $GLOBALS['phpgw_info']['flags']['update_version'] . '";';
 $script .= '    var cyrus_delimiter = "' . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'] . '";';
-//$script .= '  var init_time = setInterval( function( ){ if ( document.body ){ clearTimeout( init_time );init( ); } }, "4000" );';
+$script .= ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) ? 'init( );' : 'XEvents.add( window, "onload", init)' );
 $script .= '</script>';