Changeset 2642 for trunk/phpgwapi

Timestamp:

04/27/10 16:58:10 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corigindo problemas com o ordenamento referente aos javascripts.

Location:

trunk/phpgwapi/js/tools

Files:

• xconnector.js (modified) (3 diffs)
• xlink.js (modified) (1 diff)
• xscript.js (modified) (1 diff)

trunk/phpgwapi/js/tools/xconnector.js

@@ -108 +108 @@
                                                                         try
                                                                         {
-                                                                                _request( _data );
+                                                                          _request( _data );
                                                                         }
-                                                                        catch( e )
+                                                                        catch ( _e )
                                                                         {
-                                                                                //alert("#request\n\n" + _ID + "\n\n" + _e + "\n\n" + _e.description);
+                                                                                alert("#request\n\n" + _ID + "\n\n" + _e + "\n\n" + _e.description);
                                                                         }
 
@@ -126 +126 @@
                                         catch( e )
                                         {
+                                                //alert( "e\n\n" + e );
                                         }
                                 break;
@@ -141 +142 @@
 
                 var _SEND = null;
-
-                //if ( _THREADS[_ID]._METHOD == 'GET' )
-                //      _TARGET += '?' + _ACTION;
-
-                //_TARGET += _ID;
 
                 _THREADS[ _ID ]._XHR.open( ( ( _THREADS[ _ID ]._POST ) ? 'POST' : 'GET' ), _TARGET, true);

trunk/phpgwapi/js/tools/xlink.js

@@ -62 +62 @@
                                                         _container.appendChild( el.firstChild );
 
-                                                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 ];
+                                                var _count = 0;
+                                                function _scripts( )
+                                                {
+                                                        if ( _new_scripts[ _count ][ 2 ] == undefined || _new_scripts[ _count ][ 2 ].length == 0 )
+                                                                _script.load( function( )
+                                                                {
+                                                                        if ( ++_count < _new_scripts.length )
+                                                                                _scripts( );
+                                                                }, _new_scripts[ _count ][ 3 ] );
                                                         else
-                                                                _script.add( _new_scripts[ i ][ 2 ].substr(
-                                                                        URL_SERVER.length - 1,
-                                                                        _new_scripts[ i ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1
-                                                                ) );
+                                                        {
+                                                                _script.add(
+                                                                        _new_scripts[ _count ][ 2 ].substr(
+                                                                                URL_SERVER.length - 1,
+                                                                                _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1
+                                                                        )
+                                                                );
+                                                                if ( ++_count < _new_scripts.length )
+                                                                        _scripts( );
+                                                        }
+                                                }
 
-                                                var _it_has_loaded = _script.load( function( )
+                                                if ( _new_scripts.length )
                                                 {
-                                                        if ( _inline.length )
-                                                                window.eval( _inline.join( '' ) );
-                                                } );
-
-                                                if ( ! _it_has_loaded && _inline.length )
-                                                        window.eval( _inline.join( '' ) );
+                                                        _scripts( );
+                                                        _script.load( );
+                                                }
                                         }
                                 } );

trunk/phpgwapi/js/tools/xscript.js

@@ -18 +18 @@
         function _load( )
         {
-                if ( ! _new.length )
-                        return false;
-
                 var _handler = null;
                 if ( arguments.length && typeof arguments[ 0 ] == 'function' )
                         _handler = arguments[ 0 ];
 
-                _connector.go( {
-                        "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _new.join( ';' ),
-                        "handler" : function( data )
-                        {
-                                for ( var i = 0; i < _new.length; i++ )
-                                        _loaded[ _loaded.length ] = _new[ i ];
+                var _inline = '';
+                if ( arguments.length && typeof arguments[ 1 ] == 'string' )
+                        _inline = arguments[ 1 ];
 
-                                _new = [ ];
+                if ( ! _new.length )
+                {
+                        window.eval( _inline);
+                        if ( _handler )
+                                _handler( );
+                }
+                else
+                {
+                        var _scripts = _new.join( ';' );
 
-                                window.eval( data );
+                        for ( var i = 0; i < _new.length; i++ )
+                                _loaded[ _loaded.length ] = _new[ i ];
 
-                                if ( _handler )
-                                        _handler( data );
-                        }
-                } );
+                        _new = [ ];
+
+                        _connector.go( {
+                                "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _scripts,
+                                "handler" : function( data )
+                                {
+                                        window.eval( data + _inline);
+
+                                        if ( _handler )
+                                                _handler( );
+                                }
+                        } );
+                }
         }