Changeset 2677 for trunk/phpgwapi

Timestamp:

04/30/10 17:08:28 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problema de contexto.

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (2 diffs)
• js/tools/xlink.js (modified) (4 diffs)

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

@@ -393 +393 @@
 
                                         $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">'
-                                                . 'var URL_SERVER = "' . $webserver_url . '";'
+                                                . 'var URL_SERVER = window.location.protocol + "//" + window.location.host + "' . $webserver_url . '";'
                                                 . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>';
 
@@ -402 +402 @@
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xscript', NULL, true );
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xconnector', NULL, true );
+                                        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xml', NULL, true );
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xevent', NULL, true );
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xobject', NULL, true );

trunk/phpgwapi/js/tools/xlink.js

@@ -8 +8 @@
         var _loading = new Image( );
         _loading.src = URL_SERVER + 'phpgwapi/images/loading.gif';
+
+        function _click( _action, _cache )
+        {
+
+                if ( _action.indexOf( window.location.host ) < 0 )
+                        _action = window.location.protocol + '//' + window.location.host + _action;
+
+                _divAppboxHeader.innerHTML = '';
+
+                var _center = document.createElement( 'center' );
+                _center.appendChild( _loading );
+
+                _container.innerHTML = '';
+                _container.appendChild( _center );
+
+                _connector.go(
+                {
+                        'access' : _action,
+                        'cache' : _cache,
+                        'handler' : _handler
+                } );
+
+                window.location = '#' + (
+                        ( _action.indexOf( URL_SERVER ) < 0 ) ?
+                                _action : _action.substr( _action.indexOf( URL_SERVER ) + URL_SERVER.length )
+                );
+        }
+
+        function _intercept( pLink )
+        {
+                var action = pLink.href;
+                if ( action == '' )
+                        return false;
+
+                var a = ( action.indexOf( 'javascript:' ) === 0 );
+                a = ( a || ( action.indexOf( '#' ) === 0 ) );
+                a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
+                a = ( a || ! ( action.indexOf( 'workflow' ) < 0 ) );
+
+                if ( ! a )
+                        pLink.onclick = function( )
+                        {
+                                var _cacheit = false;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
+
+                                _click( action, _cacheit );
+
+                                return false;
+                        };
+        }
 
         function _handler( data )
@@ -29 +78 @@
                 var _links = el.getElementsByTagName( 'a' );
                 for ( var i = 0; i < _links.length; i++ )
-                        handler( _links.item( i ) );
+                        _intercept( _links.item( i ) );
 
                 _container.innerHTML = '';
@@ -67 +116 @@
         }
 
-        function handler( pLink )
-        {
-                var action = pLink.href;
-                if ( action == '' )
-                        return false;
-
-                var a = ( action.indexOf( 'javascript:' ) === 0 );
-                a = ( a || ( action.indexOf( '#' ) === 0 ) );
-                a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
-                a = ( a || ! ( action.indexOf( 'workflow' ) < 0 ) );
-
-                if ( ! a )
-                        pLink.onclick = function( )
-                        {
-                                _divAppboxHeader.innerHTML = '';
-
-                                var _center = document.createElement( 'center' );
-                                _center.appendChild( _loading );
-
-                                _container.innerHTML = '';
-                                _container.appendChild( _center );
-
-                                var _cacheit = false;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
-
-                                _connector.go(
-                                {
-                                        'access' : action,
-                                        'cache' : _cacheit,
-                                        'handler' : _handler
-                                } );
-
-                                window.location = '#' + (
-                                        ( action.indexOf( URL_SERVER ) < 0 ) ?
-                                                action : action.substr( action.indexOf( URL_SERVER ) + URL_SERVER.length )
-                                );
-
-                                return false;
-                        };
-        }
-
         function Link( )
         {
-                var _cacheit = false;
-                if ( arguments.length > 1 && arguments[ 1 ].constructor == Boolean )
-                        _cacheit = arguments[ 1 ];
-
-                _connector.go(
-                {
-                        "access" : arguments[ 0 ],
-                        "cache" : _cacheit,
-                        "handler" : _handler
-                } );
+                _click( arguments[ 0 ],
+                        (
+                                ( arguments.length > 1 && arguments[ 1 ].constructor == Boolean ) ?
+                                        arguments[ 1 ] : false
+                        )
+                );
         }
 
@@ -146 +151 @@
                 var _links = document.getElementsByTagName( 'a' );
                 for ( var i = 0; i < _links.length; i++ )
-                        handler( _links.item( i ) );
+                        _intercept( _links.item( i ) );
         } );
 } )( );