Changeset 2674 for trunk/phpgwapi/js

Timestamp:

04/30/10 12:21:35 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Criando persistência da última requisicao a ser recuperada no reload.

Location:

trunk/phpgwapi/js

Files:

• expressoAjax/dom.js (modified) (1 diff)
• tools/xlink.js (modified) (3 diffs)

trunk/phpgwapi/js/expressoAjax/dom.js

@@ -1 +1 @@
 XEvents.add( window, "onload", function( )
 {
-        if ( template == 'classic' )
+        if ( template == 'classic' || template == 'celepar' )
                 return false;
 

trunk/phpgwapi/js/tools/xlink.js

@@ -49 +49 @@
                                         _new_scripts[ _count ][ 2 ].substr(
                                                 URL_SERVER.length - 1,
-                                                _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1
+                                                _new_scripts[ _count ][ 2 ].length - URL_SERVER.length + 1 - (
+                                                        ( _new_scripts[ _count ][ 2 ].indexOf( '?' ) < 0 ) ?
+                                                                0 : ( _new_scripts[ _count ][ 2 ].length - _new_scripts[ _count ][ 2 ].indexOf( '?' ) )
+                                                )
                                         )
                                 );
@@ -86 +89 @@
                                 _container.appendChild( _center );
 
-                                var _cacheit = true;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
+                                var _cacheit = false;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
 
                                 _connector.go(
@@ -94 +97 @@
                                         'handler' : _handler
                                 } );
+
+                                window.location = '#' + (
+                                        ( action.indexOf( URL_SERVER ) < 0 ) ?
+                                                action : action.substr( action.indexOf( URL_SERVER ) + URL_SERVER.length )
+                                );
+
                                 return false;
                         };