Changeset 2603
- Timestamp:
- 04/20/10 11:58:37 (14 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r2598 r2603 161 161 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'DropDownContacts', 'expressoMail1_2' ); 162 162 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'InfoContact', 'expressoMail1_2' ); 163 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' );164 163 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'local_messages', 'expressoMail1_2' ); 165 164 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'messages_controller', 'expressoMail1_2' ); 166 165 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'rich_text_editor', 'expressoMail1_2' ); 167 166 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' ); 167 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'main', 'expressoMail1_2' ); 168 168 169 169 if ( $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_shortcuts' ] ) … … 194 194 $script .= ' expresso.connector.updateVersion = "'. $GLOBALS['phpgw_info']['flags']['update_version'] . '";'; 195 195 $script .= ' var cyrus_delimiter = "' . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'] . '";'; 196 //$script .= ' var init_time = setInterval( function( ){ if ( document.body ){ clearTimeout( init_time );init( ); } }, "4000" );';196 $script .= ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) ? 'init( );' : 'XEvents.add( window, "onload", init)' ); 197 197 $script .= '</script>'; 198 198 -
trunk/expressoMail1_2/js/jscode/load_lang.js
r2579 r2603 4 4 var _connector = new XConnector; 5 5 6 _connector.cache(); 7 var request = _connector.go( { 6 var request = _connector.cache( ).go( { 8 7 'access' : URL_SERVER + '/expressoMail1_2/inc/load_lang.php?lang=' + lang, 9 8 'handler' : function( data ) -
trunk/expressoMail1_2/js/jscode/main.js
r2598 r2603 31 31 32 32 if (preferences.delete_trash_messages_after_n_days != 0) 33 cExecute ("expressoMail1_2.imap_functions.automatic_trash_cleanness&before_date="+preferences.delete_trash_messages_after_n_days+"&cyrus_delimiter="+cyrus_delimiter, handler_automatic_trash_cleanness); 33 _connector.go( { 34 "access" : "expressoMail1_2.imap_functions.automatic_trash_cleanness&before_date=" 35 + preferences.delete_trash_messages_after_n_days + "&cyrus_delimiter=" + cyrus_delimiter, 36 "handler" : handler_automatic_trash_cleanness 37 } ); 34 38 35 39 if(preferences.outoffice == "1") … … 69 73 "handler" : save_contacts 70 74 } ); 71 cExecute ("expressoMail1_2.imap_functions.get_folders_list&onload=true", update_menu); 75 _connector.go( { 76 "access" : "expressoMail1_2.imap_functions.get_folders_list&onload=true", 77 "handler" : function( data ) 78 { 79 update_menu( expresso.connector.unserialize( data ) ); 80 } 81 } ); 72 82 73 83 }; 74 84 var handler_automatic_trash_cleanness = function(data){ 85 data = expresso.connector.unserialize( data ); 75 86 if (data != false){ 76 87 write_msg(data.length +' '+ Element('txt_clear_trash').value); … … 89 100 90 101 } 91 init();92 102 93 103 function init_offline(){ -
trunk/expressoMail1_2/templates/classic/index.tpl
r2539 r2603 36 36 </a> 37 37 </div> 38 <script type="text/javascript">39 40 var element_input = document.getElementById('em_message_search');41 42 function keyPressQuickSearchEmail(e)43 {44 if( e.keyCode == 13 )45 emQuickSearch(Element('em_message_search').value, 'null', 'null');46 }47 48 if ( element_input.addEventListener )49 element_input.addEventListener('keypress', keyPressQuickSearchEmail, false);50 else if ( element_input.attachEvent )51 element_input.attachEvent('onkeypress', keyPressQuickSearchEmail);52 53 function onFocusQuickSearchEmail(pInput)54 {55 if ( pInput.createTextRange )56 {57 var FieldRange = pInput.createTextRange();58 FieldRange.moveStart('character', pInput.value.length);59 FieldRange.collapse();60 FieldRange.select();61 }62 }63 64 </script>65 38 </td> 66 39 <td width="2px"> </td> … … 89 62 </tbody> 90 63 </table> 64 <script type="text/javascript"> 65 var element_input = document.getElementById('em_message_search'); 66 67 function keyPressQuickSearchEmail(e) 68 { 69 if( e.keyCode == 13 ) 70 emQuickSearch(Element('em_message_search').value, 'null', 'null'); 71 } 72 73 if ( element_input.addEventListener ) 74 element_input.addEventListener('keypress', keyPressQuickSearchEmail, false); 75 else if ( element_input.attachEvent ) 76 element_input.attachEvent('onkeypress', keyPressQuickSearchEmail); 77 78 function onFocusQuickSearchEmail(pInput) 79 { 80 if ( pInput.createTextRange ) 81 { 82 var FieldRange = pInput.createTextRange(); 83 FieldRange.moveStart('character', pInput.value.length); 84 FieldRange.collapse(); 85 FieldRange.select(); 86 } 87 } 88 </script> 91 89 <div id='forms_queue'></div> 92 90 <div style="display:none" id="send_queue"> -
trunk/expressoMail1_2/templates/default/index.tpl
r2539 r2603 22 22 <div id="search_div" align="center" style="white-space:nowrap"></div> 23 23 <input type="text" id="em_message_search" size="16" maxlength="22" onfocus="javascript:onFocusQuickSearchEmail(this); return false;"/> 24 <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)" />25 <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')" />24 <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/search.gif) no-repeat center; margin: 0 3px;" class="" onMouseOut="window.status='';return true;" title='{lang_Open_Search_Window}' onMouseOver="window.status='{lang_Open_Search_Window}';return true;" href="javascript:void(0);" onClick="javascript:search_emails(Element('em_message_search').value)"></a> 25 <a style="padding:1 8px; width:16px; height:16px; background: url({url}/templates/default/images/users.gif) no-repeat center;" class="" onMouseOut="window.status='';return true;" title='{lang_search_user}' onMouseOver="window.status='{lang_search_user}' ;return true;" href="javascript:void(0);" onClick="javascript:emQuickSearch(Element('em_message_search').value, 'null', 'null')"></a> 26 26 </td> 27 27 </tr> … … 64 64 </tbody> 65 65 </table> 66 <script type="text/javascript">67 var element_input = document.getElementById('em_message_search');68 69 function keyPressQuickSearchEmail(e)70 {71 if( e.keyCode == 13 )72 emQuickSearch(Element('em_message_search').value, 'null', 'null');73 }74 75 if ( element_input.addEventListener )76 element_input.addEventListener('keypress', keyPressQuickSearchEmail, false);77 else if ( element_input.attachEvent )78 element_input.attachEvent('onkeypress', keyPressQuickSearchEmail);79 80 function onFocusQuickSearchEmail(pInput)81 {82 if ( pInput.createTextRange )83 {84 var FieldRange = pInput.createTextRange();85 FieldRange.moveStart('character', pInput.value.length);86 FieldRange.collapse();87 FieldRange.select();88 }89 }90 91 </script>92 66 </td> 93 67 <td class="whiteSpace"> </td> … … 120 94 </tbody> 121 95 </table> 96 <script type="text/javascript"> 97 var element_input = document.getElementById('em_message_search'); 98 99 function keyPressQuickSearchEmail(e) 100 { 101 if( e.keyCode == 13 ) 102 emQuickSearch(Element('em_message_search').value, 'null', 'null'); 103 } 104 105 if ( element_input.addEventListener ) 106 element_input.addEventListener('keypress', keyPressQuickSearchEmail, false); 107 else if ( element_input.attachEvent ) 108 element_input.attachEvent('onkeypress', keyPressQuickSearchEmail); 109 110 function onFocusQuickSearchEmail(pInput) 111 { 112 if ( pInput.createTextRange ) 113 { 114 var FieldRange = pInput.createTextRange(); 115 FieldRange.moveStart('character', pInput.value.length); 116 FieldRange.collapse(); 117 FieldRange.select(); 118 } 119 } 120 </script> 122 121 <div id='forms_queue'></div> 123 122 <div style="display:none" id="send_queue">
Note: See TracChangeset
for help on using the changeset viewer.