Changeset 2509

Timestamp:

04/13/10 16:45:41 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Padronizando o não uso da cache.

Location:

trunk/phpgwapi

Files:

• js/tools/xconnector.js (modified) (1 diff)
• js/tools/xlink.js (modified) (2 diffs)
• templates/default/navbar.inc.php (modified) (1 diff)

trunk/phpgwapi/js/tools/xconnector.js

@@ -258 +258 @@
                 if ( this._cache && this._CACHED[ _ID ] )
                 {
+                        this._cache = false;
                         if ( _THREADS[ _ID ]._HANDLER.request )
                                 _THREADS[ _ID ]._HANDLER.request( this._CACHED[ _ID ] );

trunk/phpgwapi/js/tools/xlink.js

@@ -9 +9 @@
         {
                 var action = pLink.href;
-                /*
                 var a = ( action.indexOf( 'javascript:' ) === 0 );
                 a = ( a || ( action.indexOf( '#' ) === 0 ) );
                 a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
-                */
-                var a = ( action.indexOf( 'admin' ) > 0 );
-                a = ( a || action.indexOf( 'home' ) > 0 );
-                a = ( a || action.indexOf( 'contactcenter' ) > 0 );
-                a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 );
-                a = ( a || action.indexOf( 'filemanager' ) > 0 );
-                a = ( a || action.indexOf( 'jabberit_messenger' ) > 0 );
-                a = ( a || action.indexOf( 'preferences' ) > 0 );
-                a = ( a || action.indexOf( 'calendar' ) > 0 );
-                a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) );
+                a = ( a || ! ( action.indexOf( 'workflow' ) < 0 ) );
+                a = ( a || ! ( action.indexOf( 'expressoMail1_2' ) < 0 ) );
 
                 if ( ! a )
@@ -29 +20 @@
                                 _container.innerHTML = '';
                                 _container.appendChild( _loading );
-                                _connector.cache( );
+                                if ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' )
+                                        _connector.cache( );
                                 var request = _connector.go( {
                                         'access' : action,

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

@@ -70 +70 @@
                                 if($app != 'preferences' && $app != 'about' && $app != 'logout')
                                 {
-                                        $icon = '<a href="'.$app_data['url'].'">';
+                                        $icon = '<a href="'.$app_data['url'].'" cacheit="'.( ( $app == 'admin' || $app == 'expressoAdmin1_2' ) ? 'true' : 'false').'">';
                                         $title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
                                         if($app == 'home') $title = lang('Home');