Changeset 2248 for branches/2.1/expressoMail1_2/js/TreeShow.js
- Timestamp:
- 03/15/10 14:23:03 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1/expressoMail1_2/js/TreeShow.js
r1558 r2248 7 7 this.name_folder = ""; 8 8 this.name_func = ""; 9 connector.loadScript("TreeS");9 expresso.connector.loadScript("TreeS"); 10 10 } 11 11 Tree_Box.prototype.update_folder = function(){ … … 67 67 { 68 68 // IE does not understand regExp!!! 69 if (is_ie) 70 var reTipo = /^[a-z0-9 \-_+=]*$/i; 71 else 72 eval('var reTipo = /^[a-z0-9 \-_+=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]*$/i'); 73 return reTipo.test(exp); 69 if (is_ie) 70 var reTipo = /[^a-z0-9 \-_+=]*$/i; 71 else 72 reTipo = /[^a-z0-9 \-_=áéíóúàèìòùâêôãõÃÕÁÉÍÓÚÀÈÌÒÙÂÊÔçÇüñ]/i; 73 74 return reTipo.test(exp); 74 75 } 75 76 … … 149 150 var newp2 = ""; 150 151 if( aux[0] == "root"){ 151 if( !this.verify(newp)){152 alert(get_lang("T ype without spaces, dots or special characters!"));152 if(this.verify(newp)){ 153 alert(get_lang("The folder name must not contain special characters.")); 153 154 newp = ""; 154 155 return false; … … 158 159 } 159 160 }else{ 160 if( !this.verify(newp)){161 alert(get_lang("T ype without spaces, dots or special characters!"));161 if(this.verify(newp)){ 162 alert(get_lang("The folder name must not contain special characters.")); 162 163 newp = ""; 163 164 return false; … … 175 176 ttreeBox.name_folder = "root"; //or use var newpast 176 177 this.name_func = "newpast"; 177 connector.purgeCache();178 expresso.connector.purgeCache(); 178 179 ttreeBox.update_folder(); 179 180 } … … 205 206 return false; 206 207 }else{ 207 if( !this.verify(rename)){208 alert(get_lang("T ype without spaces, dots or special characters!"));208 if(this.verify(rename)){ 209 alert(get_lang("The folder name must not contain special characters.")); 209 210 rename = ""; 210 211 return false; … … 224 225 var handler_return = function(data) 225 226 { 226 connector.purgeCache(); 227 ttreeBox.name_folder = "root"; 228 ttreeBox.update_folder(); 227 if (data != "Ok") { 228 alert(get_lang(data)); 229 } 230 else { 231 expresso.connector.purgeCache(); 232 ttreeBox.name_folder = "root"; 233 ttreeBox.update_folder(); 234 } 229 235 } 230 236 var args = "$this.imap_functions.ren_mailbox"; … … 290 296 alert(data); 291 297 }else{ 292 connector.purgeCache();298 expresso.connector.purgeCache(); 293 299 ttreeBox.name_folder = "root"; 294 300 ttreeBox.update_folder();
Note: See TracChangeset
for help on using the changeset viewer.