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

Timestamp:

05/06/10 17:30:43 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problema do caregamento do contactcenter.

File:

• trunk/phpgwapi/js/tools/xscript.js (modified) (2 diffs)

trunk/phpgwapi/js/tools/xscript.js

@@ -5 +5 @@
         var _new = [ ];
 
-        function _add( pURL )
+        function _inline( )
         {
-                for ( var i = 0; i < _loaded.length; i++ )
-                        if ( _loaded[ i ] == pURL )
-                                return false;
+                _new[ _new.length ] = {
+                        "type" : "inline",
+                        "content" : arguments[ 0 ]
+                };
+        }
 
-                _new[ _new.length ] = pURL;
-
-                return true;
+        function _external( )
+        {
+                _new[ _new.length ] = {
+                        "type" : "external",
+                        "content" : arguments[ 0 ]
+                };
         }
 
         function _load( )
         {
-                var _handler = null;
-                if ( arguments.length && typeof arguments[ 0 ] == 'function' )
-                        _handler = arguments[ 0 ];
+                var _count = 0;
+                function _handler( )
+                {
+                        var _scripts = [ ];
+                        _script : while ( _count < _new.length && _new[ _count ].type != 'inline' )
+                        {
+                                for ( var i = 0; i < _loaded.length; i++ )
+                                        if ( _loaded[ i ] == _new[ _count ].content )
+                                        {
+                                                _count++;
+                                                continue _script;
+                                        }
 
-                var _inline = '';
-                if ( arguments.length && typeof arguments[ 1 ] == 'string' )
-                        _inline = arguments[ 1 ];
+                                _scripts[ _scripts.length ] = _loaded[ _loaded.length ] = _new[ _count ].content;
+                                _count++;
+                        }
 
-                if ( ! _new.length )
-                {
-                        window.eval( _inline);
-                        if ( _handler )
-                                _handler( );
+                        _scripts = _scripts.join( ';' );
+
+                        if ( _scripts.length )
+                                _connector.go( {
+                                        "access" : URL_SERVER + 'controller.php?action=phpgwapi.javascript.get_source&source=' + _scripts,
+                                        "handler" : function( data )
+                                        {
+                                                window.eval( data );
+                                                if ( _count < _new.length && _new[ _count ].type == 'inline' )
+                                                {
+                                                        window.eval( _new[ _count ].content );
+                                                        _count++;
+                                                        _handler( );
+                                                }
+                                                else
+                                                {
+                                                        _count++;
+                                                        _handler( );
+                                                }
+                                        }
+                                } );
+                        else
+                                if ( _count < _new.length && _new[ _count ].type == 'inline' )
+                                {
+                                        window.eval( _new[ _count ].content );
+                                        _count++;
+                                        _handler( );
+                                }
+
+                        if ( _count == _new.length )
+                                _new = [ ];
                 }
-                else
-                {
-                        var _scripts = _new.join( ';' );
-
-                        for ( var i = 0; i < _new.length; i++ )
-                                _loaded[ _loaded.length ] = _new[ i ];
-
-                        _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( );
-                                }
-                        } );
-                }
+                _handler( );
         }
 
@@ -61 +82 @@
         }
 
-        Script.prototype.add = _add;
+        Script.prototype.external = _external;
+        Script.prototype.inline = _inline;
         Script.prototype.load = _load;