Changeset 2642 for trunk/phpgwapi/js/tools/xscript.js

Timestamp:

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

Author:

rodsouza

Message:

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

File:

• trunk/phpgwapi/js/tools/xscript.js (modified) (1 diff)

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( );
+                                }
+                        } );
+                }
         }