Changeset 2628 for trunk/phpgwapi/js/tools/xlink.js

Timestamp:

04/26/10 16:03:33 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Organizando javascript e criando cache dos mesmos.

File:

• trunk/phpgwapi/js/tools/xlink.js (modified) (5 diffs)

trunk/phpgwapi/js/tools/xlink.js

@@ -1 +1 @@
 ( function( )
 {
-        var _connector = new XConnector;
+        var _connector = null;
+        var _script = null;
+
         var _container = null;
         var _divAppboxHeader = null;
@@ -23 +25 @@
                                 _divAppboxHeader.innerHTML = '';
 
+                                var _center = document.createElement( 'center' );
+                                _center.appendChild( _loading );
+
                                 _container.innerHTML = '';
-                                _container.appendChild( _loading );
+                                _container.appendChild( _center );
 
-                                var _cacheit = ( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
+                                var _cacheit = true;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false );
 
-                                var request = _connector.cache( _cacheit ).go( {
+                                var request = _connector.go( {
                                         'access' : action,
+                                        'cache' : _cacheit,
                                         'handler' : function( data )
                                         {
+                                                var js = data.match( /<script[^>]*>.*?<\/script>/g );
+                                                var _new_scripts = [ ];
+                                                if ( js )
+                                                {
+                                                        var tag = /<script([^>]* src="(\S+)"|[^>]*)>(.*?)<\/script>/;
+                                                        for ( var i = 0; i < js.length; i++ )
+                                                        {
+                                                                var type = tag.exec( js[ i ] );
+                                                                data = data.replace( "\n\t\t" + type[ 0 ], '' );
+                                                                _new_scripts[ _new_scripts.length ] = type;
+                                                        }
+                                                }
+
                                                 var el = document.createElement( 'div' );
                                                 el.innerHTML = data;
@@ -39 +58 @@
                                                         handler( _links.item( i ) );
 
-                                                var _head = document.getElementsByTagName( 'head' ).item( 0 );
-                                                var _loaded = _head.getElementsByTagName( 'script' );
-                                                var _scripts = el.getElementsByTagName( 'script' );
-                                                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 _inline = [ ];
+                                                for ( var i = 0; i < _new_scripts.length; i++ )
+                                                        if ( _new_scripts[ i ][ 2 ] == undefined || _new_scripts[ i ][ 2 ].length == 0 )
+                                                                _inline[ _inline.length ] = _new_scripts[ i ][ 3 ];
+                                                        else
+                                                                _script.add( _new_scripts[ i ][ 2 ].substr(
+                                                                        URL_SERVER.length,
+                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length
+                                                                ) );
+
+                                                var _it_has_loaded = _script.load( function( )
                                                 {
-                                                        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' )  )
-                                                                                continue fix;
+                                                        if ( _inline.length )
+                                                                window.eval( _inline.join( '' ) );
+                                                } );
 
-                                                                _head.appendChild( _script );
-                                                        }
-                                                }
+                                                if ( ! _it_has_loaded && _inline.length )
+                                                        window.eval( _inline.join( '' ) );
                                         }
                                 } );
@@ -76 +88 @@
         XEvents.add( window, 'onload', function( )
         {
-                var _center = document.createElement( 'center' );
-                _center.appendChild( _loading );
+                var _scripts = document.getElementsByTagName( 'head' ).item( 0 ).getElementsByTagName( 'script' );
+                var _loaded = [ ];
+
+                for ( var i = 0; i < _scripts.length; i++ )
+                        if ( _scripts.item( i ).getAttribute( 'src' ) != null )
+                                _loaded[ _loaded.length ] = _scripts.item( i ).getAttribute( 'src' ).substr(
+                                        URL_SERVER.length,
+                                        _scripts.item( i ).getAttribute( 'src' ).indexOf( '?' ) - URL_SERVER.length
+                                );
+
+                _connector = new XConnector;
+                _script = new XScript( _loaded );
 
                 _divAppboxHeader = document.getElementById( 'divAppboxHeader' );
@@ -83 +105 @@
 
                 _container = document.getElementById( 'divAppbox' );
-                _loading = _center;
 
                 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll';