- Timestamp:
- 04/29/10 15:03:20 (14 years ago)
- Location:
- branches/2.0/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.0/expressoMail1_2/js/common_functions.js
r2606 r2666 37 37 var content_folders = Element("content_folders"); 38 38 var clientHeight = ((window.innerHeight ? window.innerHeight : document.body.offsetHeight) - 8); 39 var clientWidth = ((window.innerWidth ? window.innerWidth : document.body.offsetWidth)); 40 39 var clientWidth = ((window.innerWidth ? window.innerWidth : document.body.offsetWidth)); 41 40 if(divScrollMain){ 42 41 divScrollMain.style.height = (clientHeight - (findPosY(divScrollMain) + (table_message.clientHeight ? table_message.clientHeight : table_message.offsetHeight))) + "px"; … … 85 84 // Translate words and phrases using user language from eGroupware. 86 85 function get_lang(_key) { 86 if (typeof(_key) == 'undefined') 87 return false; 87 88 var key = _key.toLowerCase(); 88 89 if(array_lang[key]) -
branches/2.0/expressoMail1_2/js/filter.js
r2658 r2666 42 42 43 43 44 cfilter.prototype.load_rules = function( )44 cfilter.prototype.load_rules = function( posHandler, param ) 45 45 { 46 46 var _this = this; … … 52 52 var handler_sieve = function(data) 53 53 { 54 if (data. indexOf('Error:') == 0)54 if (data.toString().indexOf('Error:') == 0) 55 55 { 56 56 _this.criticalError = true; … … 77 77 alert("Expresso:"+e.description); 78 78 } 79 if (typeof(posHandler) == 'function') 80 posHandler(param); 79 81 } 80 82 if(Element('form_status') != null) … … 413 415 } 414 416 415 this.load_rules(); 416 if(confirm(get_lang("Do you want to block this e-mail?"))){ 417 new_r = "&&ENABLED&&" + email + "&&&&&&discard&&&&0&&&&&&0"; 418 // setTimeout("filter.e_newrule('" + new_r + "')",2000); 419 if (filter.e_newrule(new_r)){ 420 this.email_deny.push(email); 421 write_msg(get_lang("The sender was blocked")); 422 }else 423 write_msg(get_lang("You have reached the maximum number of rules")); 424 } 417 var createFilter = function (param){ 418 if(confirm(get_lang("Do you want to block this e-mail?"))){ 419 new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 420 //setTimeout("filter.e_newrule('" + new_r + "')",2000); 421 if (filter.e_newrule(param)){ 422 filter.email_deny.push(param); 423 write_msg(get_lang("The sender was blocked")); 424 }else 425 write_msg(get_lang("You have reached the maximum number of rules")); 426 } 427 }; 428 this.load_rules( createFilter, email ); 425 429 } 426 430 -
branches/2.0/expressoMail1_2/js/filters.js
r810 r2666 67 67 68 68 this.showWindow(form); 69 filter.load_rules(); 70 this.list_rules(); 71 69 if ( filter.rulest.length > 0 ) 70 this.list_rules(); 71 else 72 filter.load_rules(this.list_rules); 72 73 } 73 74 … … 76 77 setTimeout("filters.mount_list()",2500); 77 78 else 78 this.mount_list();79 filters.mount_list(); 79 80 } 80 81
Note: See TracChangeset
for help on using the changeset viewer.