Changeset 2578 for trunk/phpgwapi
- Timestamp:
- 04/16/10 18:58:38 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.javascript.inc.php
r2576 r2578 140 140 $script .= file_get_contents($filePath).";\n"; 141 141 } 142 } 142 } 143 143 else 144 144 { 145 $_file = PHPGW_INCLUDE_ROOT . SEP . $app . SEP . 'js' . SEP . $pkg . SEP. $file . '.js'; 146 145 147 $links .= '<script type="text/javascript" src="' 146 148 . $GLOBALS['phpgw_info']['server']['webserver_url'] 147 . "/$app/js/$pkg/$file" . '.js?' . microtime( true ) . '">'149 . "/$app/js/$pkg/$file" . '.js?' . filemtime( $_file ) . '">' 148 150 . "</script>\n"; 149 151 } -
trunk/phpgwapi/js/tools/xconnector.js
r2509 r2578 115 115 catch( e ) 116 116 { 117 //alert("#request\n\n" + _ e + "\n\n" + _e.description);117 //alert("#request\n\n" + _ID + "\n\n" + _e + "\n\n" + _e.description); 118 118 } 119 119 … … 141 141 142 142 var _ACTION = 'act=' + _ID; 143 var _TARGET = _THREADS[ _ID ]._ACCESS;143 var _TARGET = this._PATH + this._CONTROLLER + _THREADS[ _ID ]._ACCESS; 144 144 145 145 var _SEND = null; -
trunk/phpgwapi/js/tools/xlink.js
r2565 r2578 36 36 el.innerHTML = data; 37 37 38 var links = el.getElementsByTagName( 'a' ); 39 for ( var i = 0; i < links.length; i++ ) 40 handler( links.item( i ) ); 38 var _links = el.getElementsByTagName( 'a' ); 39 for ( var i = 0; i < _links.length; i++ ) 40 handler( _links.item( i ) ); 41 42 var _head = document.getElementsByTagName( 'head' ).item( 0 ); 43 var _loaded = _head.getElementsByTagName( 'script' ); 44 var _scripts = el.getElementsByTagName( 'script' ); 45 fix : for ( var i = 0; i < _scripts.length; i++ ) 46 { 47 var _script = _scripts.item( i ); 48 if ( _script.getAttribute( 'src' ) == null ) 49 continue; 50 else 51 { 52 for ( var j = 0; j < _loaded.length; j++ ) 53 if ( _script.getAttribute( 'src' ) === _loaded.item( j ).getAttribute( 'src' ) ) 54 { 55 el.removeChild( _script ); 56 continue fix; 57 } 58 59 _head.appendChild( _script ); 60 i--; 61 } 62 } 41 63 42 64 _container.innerHTML = ''; … … 62 84 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll'; 63 85 64 var links = document.getElementsByTagName( 'a' );65 for ( var i = 0; i < links.length; i++ )66 handler( links.item( i ) );86 var _links = document.getElementsByTagName( 'a' ); 87 for ( var i = 0; i < _links.length; i++ ) 88 handler( _links.item( i ) ); 67 89 } ); 68 90 } )( ); -
trunk/phpgwapi/templates/default/navbar.inc.php
r2529 r2578 64 64 } 65 65 66 $curr_app = NULL; 66 67 $i = 0; 67 68 foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data) … … 79 80 { 80 81 $current_app = True; 81 echo '<script>var curr_app = "' . str_replace('_','',$app) . 'id";</script>';82 $curr_app = $app; 82 83 } 83 84 … … 120 121 . ' onmouseout="if ( this.className != \'navbar_butOut\'){this.className=\'navbar_but\'; zoom_out(this.firstChild.firstChild.id);}"' 121 122 . ' onclick="if ( this.className != \'navbar_butOut\'){this.className=\'navbar_butOut\'; zoom_out(curr_app);' 122 . ' document.getElementById(curr_app).parentNode.parentNode.className=\'navbar_but\';curr_app=\'' . str_replace('_','',$app) . 'id\'}"'123 . 'var app = document.getElementById(curr_app); if ( app ) app.parentNode.parentNode.className=\'navbar_but\';curr_app=\'' . str_replace('_','',$app) . 'id\'}"' 123 124 . ' class="navbar_but'.($current_app?'Out':'').'">'; 124 125 … … 162 163 } 163 164 } 165 166 echo '<script>var curr_app = "' . ( ( $curr_app ) ? str_replace( '_','',$curr_app ) . 'id' : '' ) . '";</script>'; 164 167 165 168 if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']!='no') -
trunk/phpgwapi/templates/default/navbar.tpl
r2529 r2578 75 75 clearTimeout(zoominTimer[id]); 76 76 var elem = document.getElementById(id); 77 if ( ! elem ) 78 return; 77 79 if (elem.height < 24) 78 80 {
Note: See TracChangeset
for help on using the changeset viewer.