Changeset 2601 for trunk/phpgwapi

Timestamp:

04/20/10 11:50:19 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Melhorando a forma de criar cache em uma requisição background.

Location:

trunk/phpgwapi/js/tools

Files:

• xconnector.js (modified) (1 diff)
• xlink.js (modified) (2 diffs)

trunk/phpgwapi/js/tools/xconnector.js

@@ -333 +333 @@
         Connector.prototype.cache = function( )
         {
-                this._cache = true;
+                _cache = true;
+
+                if ( arguments.length == 1 && arguments[ 0 ].constructor == Boolean )
+                        _cache = arguments[ 0 ];
+
+                this._cache = _cache;
+
+                return this;
         };
         window.XConnector = Connector;

trunk/phpgwapi/js/tools/xlink.js

@@ -26 +26 @@
                                 _container.appendChild( _loading );
 
-                                if ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' )
-                                        _connector.cache( );
+                                var _cacheit = ( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
 
-                                var request = _connector.go( {
+                                var request = _connector.cache( _cacheit ).go( {
                                         'access' : action,
                                         'handler' : function( data )
@@ -43 +42 @@
                                                 var _loaded = _head.getElementsByTagName( 'script' );
                                                 var _scripts = el.getElementsByTagName( 'script' );
-                                                fix : for ( var i = 0; i < _scripts.length; i++ )
+                                                var _new_scripts = [ ];
+
+                                                while ( _scripts.length )
+                                                        _new_scripts[ _new_scripts.length ] = el.removeChild( _scripts.item( 0 ) );
+
+                                                _container.innerHTML = '';
+                                                while ( el.hasChildNodes( ) )
+                                                        _container.appendChild( el.firstChild );
+
+                                                fix : for ( var i = 0; i < _new_scripts.length; i++ )
                                                 {
-                                                        var _script = _scripts.item( i );
+                                                        var _script = _new_scripts[ i ];
                                                         if ( _script.getAttribute( 'src' ) == null )
+                                                        {
+                                                                _container.appendChild( _script );
                                                                 continue;
+                                                        }
                                                         else
                                                         {
                                                                 for ( var j = 0; j < _loaded.length; j++ )
                                                                         if ( _script.getAttribute( 'src' ) === _loaded.item( j ).getAttribute( 'src' )  )
-                                                                        {
-                                                                                el.removeChild( _script );
                                                                                 continue fix;
-                                                                        }
 
                                                                 _head.appendChild( _script );
-                                                                i--;
                                                         }
                                                 }
-
-                                                _container.innerHTML = '';
-                                                while ( el.hasChildNodes( ) )
-                                                        _container.appendChild( el.firstChild );
                                         }
                                 } );