Changeset 2656
- Timestamp:
- 04/28/10 17:08:46 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
expressoMail1_2/inc/class.functions.inc.php (modified) (1 diff)
-
expressoMail1_2/js/jscode/main.js (modified) (1 diff)
-
index.php (modified) (3 diffs)
-
phpgwapi/js/tools/xlink.js (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.functions.inc.php
r2360 r2656 117 117 118 118 function get_preferences() { 119 return $_SESSION['phpgw_info']['user']['preferences']['expressoMail']; 119 echo json_encode( $_SESSION['phpgw_info']['user']['preferences']['expressoMail'] ); 120 exit; 120 121 } 121 122 // Unicode Conversor: convert everything from UTF-8 into an NCR[Numeric Character Reference] -
trunk/expressoMail1_2/js/jscode/main.js
r2645 r2656 26 26 var save_preferences = function(data) 27 27 { 28 preferences = expresso.connector.unserialize( data);28 preferences = data.JSON( ); 29 29 _connector.cache(); 30 30 _connector.go( { -
trunk/index.php
r2623 r2656 54 54 55 55 $GLOBALS['phpgw_info']['flags'] = array( 56 //'noheader' => True,57 //'nonavbar' => True,58 56 'currentapp' => $app 59 57 ); … … 68 66 if ( $app == 'home' && ! $api_requested ) 69 67 { 70 $GLOBALS[ 'phpgw' ] -> redirect_link( '/home.php' ); 68 echo '<script>XLink( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );</script>'; 69 exit; 71 70 } 72 71 … … 124 123 } 125 124 126 $GLOBALS['phpgw']->redirect_link('/home.php'); 125 echo '<script>XLink( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );</script>'; 126 exit; 127 127 } 128 129 /*if(!isset($GLOBALS['phpgw_info']['nofooter']))130 {131 $GLOBALS['phpgw']->common->phpgw_footer();132 }*/133 128 ?> -
trunk/phpgwapi/js/tools/xlink.js
r2642 r2656 1 1 ( function( ) 2 2 { 3 var _connector = n ull;3 var _connector = new XConnector; 4 4 var _script = null; 5 5 … … 8 8 var _loading = new Image( ); 9 9 _loading.src = URL_SERVER + 'phpgwapi/images/loading.gif'; 10 11 function _handler( data ) 12 { 13 var js = data.match( /<script[^>]*>.*?<\/script>/g ); 14 var _new_scripts = [ ]; 15 if ( js ) 16 { 17 var tag = /<script([^>]* src="(\S+)"|[^>]*)>(.*?)<\/script>/; 18 for ( var i = 0; i < js.length; i++ ) 19 { 20 var type = tag.exec( js[ i ] ); 21 data = data.replace( "\n\t\t" + type[ 0 ], '' ); 22 _new_scripts[ _new_scripts.length ] = type; 23 } 24 } 25 26 var el = document.createElement( 'div' ); 27 el.innerHTML = data; 28 29 var _links = el.getElementsByTagName( 'a' ); 30 for ( var i = 0; i < _links.length; i++ ) 31 handler( _links.item( i ) ); 32 33 _container.innerHTML = ''; 34 while ( el.hasChildNodes( ) ) 35 _container.appendChild( el.firstChild ); 36 37 var _count = 0; 38 function _scripts( ) 39 { 40 if ( _new_scripts[ _count ][ 2 ] == undefined || _new_scripts[ _count ][ 2 ].length == 0 ) 41 _script.load( function( ) 42 { 43 if ( ++_count < _new_scripts.length ) 44 _scripts( ); 45 }, _new_scripts[ _count ][ 3 ] ); 46 else 47 { 48 _script.add( 49 _new_scripts[ _count ][ 2 ].substr( 50 URL_SERVER.length - 1, 51 _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1 52 ) 53 ); 54 if ( ++_count < _new_scripts.length ) 55 _scripts( ); 56 } 57 } 58 59 if ( _new_scripts.length ) 60 { 61 _scripts( ); 62 _script.load( ); 63 } 64 } 10 65 11 66 function handler( pLink ) … … 33 88 var _cacheit = true;//( ( pLink.hasAttribute( 'cacheit' ) && pLink.getAttribute( 'cacheit' ) === 'true' ) ? true : false ); 34 89 35 var request = _connector.go( { 90 _connector.go( 91 { 36 92 'access' : action, 37 93 'cache' : _cacheit, 38 'handler' : function( data ) 39 { 40 var js = data.match( /<script[^>]*>.*?<\/script>/g ); 41 var _new_scripts = [ ]; 42 if ( js ) 43 { 44 var tag = /<script([^>]* src="(\S+)"|[^>]*)>(.*?)<\/script>/; 45 for ( var i = 0; i < js.length; i++ ) 46 { 47 var type = tag.exec( js[ i ] ); 48 data = data.replace( "\n\t\t" + type[ 0 ], '' ); 49 _new_scripts[ _new_scripts.length ] = type; 50 } 51 } 52 53 var el = document.createElement( 'div' ); 54 el.innerHTML = data; 55 56 var _links = el.getElementsByTagName( 'a' ); 57 for ( var i = 0; i < _links.length; i++ ) 58 handler( _links.item( i ) ); 59 60 _container.innerHTML = ''; 61 while ( el.hasChildNodes( ) ) 62 _container.appendChild( el.firstChild ); 63 64 var _count = 0; 65 function _scripts( ) 66 { 67 if ( _new_scripts[ _count ][ 2 ] == undefined || _new_scripts[ _count ][ 2 ].length == 0 ) 68 _script.load( function( ) 69 { 70 if ( ++_count < _new_scripts.length ) 71 _scripts( ); 72 }, _new_scripts[ _count ][ 3 ] ); 73 else 74 { 75 _script.add( 76 _new_scripts[ _count ][ 2 ].substr( 77 URL_SERVER.length - 1, 78 _new_scripts[ _count ][ 2 ].indexOf( '?' ) - URL_SERVER.length + 1 79 ) 80 ); 81 if ( ++_count < _new_scripts.length ) 82 _scripts( ); 83 } 84 } 85 86 if ( _new_scripts.length ) 87 { 88 _scripts( ); 89 _script.load( ); 90 } 91 } 94 'handler' : _handler 92 95 } ); 93 96 return false; 94 97 }; 95 98 } 99 100 function Link( ) 101 { 102 var _cacheit = false; 103 if ( arguments.length > 1 && arguments[ 1 ].constructor == Boolean ) 104 _cacheit = arguments[ 1 ]; 105 106 _connector.go( 107 { 108 "access" : arguments[ 0 ], 109 "cache" : _cacheit, 110 "handler" : _handler 111 } ); 112 } 113 114 window.XLink = Link; 96 115 97 116 XEvents.add( window, 'onload', function( ) … … 107 126 ); 108 127 109 _connector = new XConnector;110 128 _script = new XScript( _loaded ); 111 129
Note: See TracChangeset
for help on using the changeset viewer.
