Changeset 2729 for trunk/phpgwapi/js/tools/xlink.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/xlink.js (modified) (2 diffs)

trunk/phpgwapi/js/tools/xlink.js

@@ -78 +78 @@
                 if ( js )
                 {
-                        var tag = /<script([^>]* src="(\S+)"|[^>]*)>(.*?)<\/script>/;
+                        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 ], '' );
+                                data = data.replace( type[ 0 ], '' );
                                 _new_scripts[ _new_scripts.length ] = type;
                         }
@@ -98 +98 @@
                         _container.appendChild( el.firstChild );
 
-                var _count = 0;
-                function _scripts( )
+                for ( var i = 0; i < _new_scripts.length; i++ )
                 {
-                        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 ] );
+                        if ( _new_scripts[ i ][ 2 ] == undefined || _new_scripts[ i ][ 2 ].length == 0 )
+                                _script.inline( _new_scripts[ i ][ 3 ] );
                         else
                         {
-                                if ( _new_scripts[ _count ][ 2 ].indexOf( window.location.host ) < 0 )
-                                        _new_scripts[ _count ][ 2 ] = window.location.protocol + '//' + window.location.host + _new_scripts[ _count ][ 2 ];
+                                if ( _new_scripts[ i ][ 2 ].indexOf( window.location.host ) < 0 )
+                                        _new_scripts[ i ][ 2 ] = window.location.protocol + '//' + window.location.host + _new_scripts[ i ][ 2 ];
 
-                                _script.add(
-                                        _new_scripts[ _count ][ 2 ].substr(
+                                _script.external(
+                                        _new_scripts[ i ][ 2 ].substr(
                                                 _path.length - 1,
-                                                _new_scripts[ _count ][ 2 ].length - _path.length + 1 - (
-                                                        ( _new_scripts[ _count ][ 2 ].indexOf( '?' ) < 0 ) ?
-                                                                0 : ( _new_scripts[ _count ][ 2 ].length - _new_scripts[ _count ][ 2 ].indexOf( '?' ) )
+                                                _new_scripts[ i ][ 2 ].length - _path.length + 1 - (
+                                                        ( _new_scripts[ i ][ 2 ].indexOf( '?' ) < 0 ) ?
+                                                                0 : ( _new_scripts[ i ][ 2 ].length - _new_scripts[ i ][ 2 ].indexOf( '?' ) )
                                                 )
                                         )
                                 );
-                                if ( ++_count < _new_scripts.length )
-                                        _scripts( );
                         }
                 }
 
-                if ( _new_scripts.length )
-                {
-                        _scripts( );
-                        _script.load( );
-                }
+                _script.load( );
         }