Changeset 3526 in subversion
- Timestamp:
- Apr 22, 2010 4:10:07 AM (3 years ago)
- File:
-
- 1 edited
-
trunk/roundcubemail/skins/default/functions.js (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/roundcubemail/skins/default/functions.js
r3425 r3526 28 28 function rcmail_show_header_form(id) 29 29 { 30 var link, row, parent, ns, ps; 31 32 link = document.getElementById(id + '-link'); 33 parent = link.parentNode; 34 35 if ((ns = rcmail_next_sibling(link))) 36 ns.style.display = 'none'; 37 else if ((ps = rcmail_prev_sibling(link))) 38 ps.style.display = 'none'; 30 var row, s, 31 link = document.getElementById(id + '-link'); 32 33 if ((s = rcmail_next_sibling(link))) 34 s.style.display = 'none'; 35 else if ((s = rcmail_prev_sibling(link))) 36 s.style.display = 'none'; 39 37 40 38 link.style.display = 'none'; 41 39 42 if ((row = document.getElementById('compose-' + id))) 43 { 44 var div = document.getElementById('compose-div'); 45 var headers_div = document.getElementById('compose-headers-div'); 40 if ((row = document.getElementById('compose-' + id))) { 41 var div = document.getElementById('compose-div'), 42 headers_div = document.getElementById('compose-headers-div'); 46 43 row.style.display = (document.all && !window.opera) ? 'block' : 'table-row'; 47 44 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 48 }45 } 49 46 50 47 return false; … … 53 50 function rcmail_hide_header_form(id) 54 51 { 55 var row, parent, ns, link, links; 56 57 link = document.getElementById(id + '-link'); 52 var row, ns, 53 link = document.getElementById(id + '-link'), 54 parent = link.parentNode, 55 links = parent.getElementsByTagName('a'); 56 58 57 link.style.display = ''; 59 60 parent = link.parentNode;61 links = parent.getElementsByTagName('a');62 58 63 59 for (var i=0; i<links.length; i++) 64 60 if (links[i].style.display != 'none') 65 61 for (var j=i+1; j<links.length; j++) 66 if (links[j].style.display != 'none')62 if (links[j].style.display != 'none') 67 63 if ((ns = rcmail_next_sibling(links[i]))) { 68 ns.style.display = '';69 break;70 }64 ns.style.display = ''; 65 break; 66 } 71 67 72 68 document.getElementById('_' + id).value = ''; 73 69 74 if ((row = document.getElementById('compose-' + id))) 75 { 76 var div = document.getElementById('compose-div'); 77 var headers_div = document.getElementById('compose-headers-div'); 70 if ((row = document.getElementById('compose-' + id))) { 71 var div = document.getElementById('compose-div'), 72 headers_div = document.getElementById('compose-headers-div'); 78 73 row.style.display = 'none'; 79 74 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 80 }75 } 81 76 82 77 return false; … … 101 96 function rcmail_init_compose_form() 102 97 { 103 var cc_field = document.getElementById('_cc'); 104 if (cc_field && cc_field.value!='') 98 var cc_field = document.getElementById('_cc'), 99 bcc_field = document.getElementById('_bcc'), 100 div = document.getElementById('compose-div'), 101 headers_div = document.getElementById('compose-headers-div'); 102 103 if (cc_field && cc_field.value != '') 105 104 rcmail_show_header_form('cc'); 106 105 107 var bcc_field = document.getElementById('_bcc'); 108 if (bcc_field && bcc_field.value!='') 106 if (bcc_field && bcc_field.value != '') 109 107 rcmail_show_header_form('bcc'); 110 108 … … 112 110 if (bw.ie) { 113 111 var form = rcube_find_object('form'); 114 form.onkeydown = function (e) { if (rcube_event.get_keycode(e) == 27) rcube_event.cancel(e); }; 112 form.onkeydown = function (e) { 113 if (rcube_event.get_keycode(e) == 27) 114 rcube_event.cancel(e); 115 }; 115 116 } 116 117 117 118 // fix editor position on some browsers 118 var div = document.getElementById('compose-div');119 var headers_div = document.getElementById('compose-headers-div');120 119 div.style.top = parseInt(headers_div.offsetHeight, 10) + 'px'; 121 120 } … … 264 263 this.show_listmenu(); 265 264 266 var sort = $('input[name="sort_col"]:checked').val() ;267 var ord = $('input[name="sort_ord"]:checked').val();268 var thread = $('input[name="view"]:checked').val();269 varcols = $('input[name="list_col[]"]:checked')270 .map(function(){ return this.value; }).get();265 var sort = $('input[name="sort_col"]:checked').val(), 266 ord = $('input[name="sort_ord"]:checked').val(), 267 thread = $('input[name="view"]:checked').val(), 268 cols = $('input[name="list_col[]"]:checked') 269 .map(function(){ return this.value; }).get(); 271 270 272 271 rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
Note: See TracChangeset
for help on using the changeset viewer.
