Changeset 2756

Timestamp:

05/11/10 15:13:27 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Melhorando a manipulação de javascripts.

Location:

trunk/phpgwapi/js/tools

Files:

• xlink.js (modified) (1 diff)
• xscript.js (modified) (2 diffs)

trunk/phpgwapi/js/tools/xlink.js

@@ -71 +71 @@
                 function _handler( data )
                 {
+                        data = data.trim( );
                         data = data.replace( /\n/g, '__LINE_FEED_CHARACTER__' );
-                        var js = data.match( /<script[^>]*>.*?<\/script>/gi );
-                        if ( js )
+                        data = data.replace( /\r|\t/g, '' );
+                        var _js = data.match( /<script[^>]*>.*?<\/script>/gi );
+                        if ( _js )
                         {
-                                var _tag = /<script([^>]*src="(\S+)"[^>]*|[^>]*)>(.*?)<\/script>/i;
-                                for ( var i = 0; i < js.length; i++ )
+                                var _tag = /<script([^>]+src=["'](\S+)["'])?[^>]*>(.*?)<\/script>/i;
+                                for ( var i = 0; i < _js.length; i++ )
                                 {
-                                        var _type = _tag.exec( js[ i ] );
-                                        data = data.replace( _type[ 0 ], '' );
+                                        data = data.replace( _js[ i ], '' );
 
-                                        if ( _type[ 2 ] == undefined || _type[ 2 ].length == 0 )
-                                                _script.inline( _type[ 3 ].replace( /__LINE_FEED_CHARACTER__/g, '\n' ) );
+                                        _js[ i ] = _tag.exec( _js[ i ] );
+
+                                        if ( _js[ i ][ 2 ] == undefined || _js[ i ][ 2 ].length == 0 )
+                                                _script.inline( _js[ i ][ 3 ].replace( /__LINE_FEED_CHARACTER__/g, '\n' ) );
                                         else
                                         {
-                                                if ( _type[ 2 ].indexOf( window.location.host ) < 0 )
-                                                        _type[ 2 ] = window.location.protocol + '//' + window.location.host + _type[ 2 ];
+                                                var _external = _js[ i ][ 2 ];
+
+                                                if ( _external.indexOf( window.location.host ) < 0 )
+                                                        _external = window.location.protocol + '//' + window.location.host + _external;
 
                                                 _script.external(
-                                                        _type[ 2 ].substr(
+                                                        _external.substr(
                                                                 _path.length - 1,
-                                                                _type[ 2 ].length - _path.length + 1 - (
-                                                                        ( _type[ 2 ].indexOf( '?' ) < 0 ) ?
-                                                                                0 : ( _type[ 2 ].length - _type[ 2 ].indexOf( '?' ) )
+                                                                _external.length - _path.length + 1 - (
+                                                                        ( _external.indexOf( '?' ) < 0 ) ?
+                                                                                0 : ( _external.length - _external.indexOf( '?' ) )
                                                                 )
                                                         )

trunk/phpgwapi/js/tools/xscript.js

@@ -47 +47 @@
                                         "handler" : function( data )
                                         {
-                                                window.eval( data );
                                                 if ( _count < _new.length && _new[ _count ].type == 'inline' )
-                                                {
-                                                        window.eval( _new[ _count ].content );
-                                                        _count++;
-                                                        _handler( );
-                                                }
+                                                        data += _new[ _count ].content;
+
+                                                if ( window.execScript )
+                                                        window.execScript( data );
                                                 else
-                                                {
-                                                        _count++;
-                                                        _handler( );
-                                                }
+                                                        with ( window )
+                                                                window.eval( data );
+
+                                                _count++;
+                                                _handler( );
                                         }
                                 } );
@@ -64 +63 @@
                                 if ( _count < _new.length && _new[ _count ].type == 'inline' )
                                 {
-                                        window.eval( _new[ _count ].content );
+                                        if ( window.execScript )
+                                                window.execScript( _new[ _count ].content );
+                                        else
+                                                with ( window )
+                                                        window.eval( _new[ _count ].content );
+
                                         _count++;
                                         _handler( );