Changeset 2666 for branches/2.0/expressoMail1_2/js/filter.js

Timestamp:

04/29/10 15:03:20 (14 years ago)

Author:

niltonneto

Message:

Ticket #1056 - Corrigido problema que remove todas as regras ao criar um nova.

File:

• branches/2.0/expressoMail1_2/js/filter.js (modified) (4 diffs)

branches/2.0/expressoMail1_2/js/filter.js

@@ -42 +42 @@
 
         
-        cfilter.prototype.load_rules = function()
+        cfilter.prototype.load_rules = function( posHandler, param )
         {
                 var _this = this;
@@ -52 +52 @@
                         var handler_sieve = function(data)
                         {
-                                if (data.indexOf('Error:') == 0)
+                                if (data.toString().indexOf('Error:') == 0)
                                 {
                                         _this.criticalError = true;
@@ -77 +77 @@
                                         alert("Expresso:"+e.description);
                                 }
+                                if (typeof(posHandler) == 'function') 
+                                        posHandler(param); 
                         }
                         if(Element('form_status') != null)
@@ -413 +415 @@
                 }
 
-                this.load_rules();
-                if(confirm(get_lang("Do you want to block this e-mail?"))){
-                        new_r = "&&ENABLED&&" + email + "&&&&&&discard&&&&0&&&&&&0";
-//                      setTimeout("filter.e_newrule('" + new_r + "')",2000);           
-                        if (filter.e_newrule(new_r)){
-                                this.email_deny.push(email);
-                                write_msg(get_lang("The sender was blocked"));                                                  
-                        }else
-                                write_msg(get_lang("You have reached the maximum number of rules"));
-                }
+                var createFilter = function (param){
+                        if(confirm(get_lang("Do you want to block this e-mail?"))){
+                                new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0";
+                                //setTimeout("filter.e_newrule('" + new_r + "')",2000);         
+                                if (filter.e_newrule(param)){
+                                        filter.email_deny.push(param);
+                                        write_msg(get_lang("The sender was blocked"));                                                  
+                                }else
+                                        write_msg(get_lang("You have reached the maximum number of rules"));
+                        }
+                };
+                this.load_rules( createFilter, email );
         }