Changeset 2247 for trunk/expressoMail1_2/js

Timestamp:

03/15/10 14:10:57 (14 years ago)

Author:

eduardoalex

Message:

Ticket #887 - Alteracao da mensagem exibida para o usuario, sera necessario atualizar o lang

File:

• trunk/expressoMail1_2/js/TreeShow.js (modified) (5 diffs)

trunk/expressoMail1_2/js/TreeShow.js

@@ -67 +67 @@
         {
                 // IE does not understand regExp!!!
-                if (is_ie)
-                        var reTipo = /^[a-z0-9 \-_+=]*$/i;
-                else
-                        eval('var reTipo = /^[a-z0-9 \-_+=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]*$/i');
-                return reTipo.test(exp);
+                if (is_ie)
+                        var reTipo = /[^a-z0-9 \-_+=]*$/i;
+                else
+                        reTipo = /[^a-z0-9 \-_=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]/i;
+                        
+        return reTipo.test(exp);
         }
 
@@ -149 +150 @@
                 var newp2 = "";
                 if( aux[0] == "root"){
-                        if(!this.verify(newp)){
-                                alert(get_lang("Type without spaces, dots or special characters!"));
+                        if(this.verify(newp)){
+                                alert(get_lang("The folder name must not contain special characters."));
                                 newp = "";
                                 return false;
@@ -158 +159 @@
                         }
                 }else{
-                        if(!this.verify(newp)){
-                                alert(get_lang("Type without spaces, dots or special characters!"));
+                        if(this.verify(newp)){
+                                alert(get_lang("The folder name must not contain special characters."));
                                 newp = "";
                                 return false;
@@ -205 +206 @@
                                 return false;
                         }else{
-                                if(!this.verify(rename)){
-                    alert(get_lang("Type without spaces, dots or special characters!"));
+                                if(this.verify(rename)){
+                    alert(get_lang("The folder name must not contain special characters."));
                                         rename = "";
                                         return false;
@@ -224 +225 @@
                         var handler_return = function(data)
                         {
-                                expresso.connector.purgeCache();
-                                ttreeBox.name_folder = "root";
-                                ttreeBox.update_folder();
+                                if (data != "Ok") {
+                                        alert(get_lang(data));
+                                }
+                                else {
+                                        expresso.connector.purgeCache();
+                                        ttreeBox.name_folder = "root";
+                                        ttreeBox.update_folder();
+                                }
                         }
                         var args = "$this.imap_functions.ren_mailbox";