Changeset 2561 for trunk/phpgwapi

Timestamp:

04/16/10 12:11:51 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a execução de javascript no ExpressoMail?.

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (3 diffs)
• inc/class.javascript.inc.php (modified) (1 diff)
• js/tools/xobject.js (added)
• templates/classic/head.tpl (modified) (1 diff)
• templates/default/head.inc.php (modified) (3 diffs)
• templates/default/head.tpl (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -395 +395 @@
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xconnector', NULL, true );
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xevent', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xobject', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'cookieManager', 'phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] );
 
                                         $this -> phpgw_header( );
@@ -1138 +1140 @@
                 @discussion *someone wanna add some detail here*
                 */
-                function navbar()
+                function navbar( )
                 {
                         $GLOBALS['phpgw_info']['navbar']['home']['title'] = 'Home';
@@ -1252 +1254 @@
                         header('Content-type: text/html; charset='.$GLOBALS['phpgw']->translation->charset());
 
-                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/head.inc.php');
-
-                        $this->navbar(False);
-
-                        include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php');
+                        $path = PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'];
+
+                        include_once( "{$path}/head.inc.php" );
+
+                        $this -> navbar( false );
+
+                        include_once( "{$path}/navbar.inc.php" );
 
                         if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -236 +236 @@
 
                                 if ( ! array_key_exists( $app, $this -> files ) )
-                                        $this -> files[ $app ] = array( );
+                                        if ( $stack )
+                                                $this -> files = array_merge( array( $app => array( ) ), $this -> files) ;
+                                        else
+                                                $this -> files[ $app ] = array( );
 
                                 if ( ! array_key_exists( $package, $this -> files[ $app ] ) )
-                                        $this -> files[ $app ][ $package ] = array( );
+                                        if ( $stack )
+                                                $this -> files[ $app ] = array_merge( array( $package => array( ) ), $this -> files[ $app ] );
+                                        else
+                                                $this -> files[ $app ][ $package ] = array( );
 
                                 if ( $stack )

trunk/phpgwapi/templates/classic/head.tpl

@@ -19 +19 @@
                 {css}
                 {java_script}
-                {cookie_manager}
         </head>
         <!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->

trunk/phpgwapi/templates/default/head.inc.php

@@ -45 +45 @@
         }
 
-        if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
-        {
-                $slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/slidereffects.js';
-                $slider_effects = '<script src="'.$slider_effects_src.'" type="text/javascript">
-                </script>';
-        }
-        else
-        {
-                $simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/simple_show_hide.js';
-                $simple_show_hide = '<script src="'.$simple_show_hide_src.'" type="text/javascript">
-                </script>';
-        }
+        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode',
+                ( ( ! $GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'] ) ? 'slidereffects' : 'simple_show_hide' ),
+                'phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'], true );
 
-        $cookie_manager = '<script src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/cookieManager.js" type="text/javascript"></script>'; 
         $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
         $tpl->set_unknowns('remove');
@@ -83 +73 @@
                 'pngfix'        => $pngfix,
                 'slider_effects'=> $slider_effects,
-                'simple_show_hide'=> $simple_show_hide,
+                'simple_show_hide'=> '',//$simple_show_hide,
                 'lang_code'=> $lang_code,
                 'charset'       => $GLOBALS['phpgw']->translation->charset(),
@@ -91 +81 @@
                 'css'           => $GLOBALS['phpgw']->common->get_css(),
                 'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
-                'cookie_manager'=>      $cookie_manager
+                'cookie_manager'=> ''
         );
         $tpl->set_var($var);

trunk/phpgwapi/templates/default/head.tpl

@@ -19 +19 @@
                 {css}
                 {java_script}
-                {cookie_manager}
         </head>
         <!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->