Changeset 5887
- Timestamp:
- 04/05/12 16:39:51 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r5886 r5887 3170 3170 function import_window() 3171 3171 { 3172 var folder = {}; 3172 3173 var importEmails = $("#importEmails"); 3173 3174 importEmails.html( DataLayer.render( BASE_PATH + "modules/mail/templates/importEmails.ejs", {})); … … 3218 3219 var handler_return = function(data) 3219 3220 { 3220 return_import_msgs( data, input_hidden.attr("value") ); 3221 write_msg(get_lang('The import was executed successfully.')); 3222 3223 return_import_msgs( data, folder ); 3221 3224 } 3222 3225 3223 3226 var formSend = document.getElementById("importFileMessages"); 3224 3227 … … 3287 3290 if (target.attr('id') == "foldertree") return; 3288 3291 3289 var targetId = target.attr('id'); 3290 var child = target.find('.folder'); 3292 folder.id = target.attr('id'); 3293 folder.child = target.find('.folder'); 3294 folder.caption = target.find('span').attr('title'); 3291 3295 3292 3296 $('.filetree span.folder.selected').removeClass('selected'); … … 3295 3299 3296 3300 selectedFolder = { 3297 id: targetId,3298 name: child.attr('title'),3299 'class': child.attr('class')3301 id: folder.id, 3302 name: folder.child.attr('title'), 3303 'class': folder.child.attr('class') 3300 3304 }; 3301 3305 3302 importEmails.find("input[name=folder]").attr("value", targetId);3306 importEmails.find("input[name=folder]").attr("value", folder.id); 3303 3307 }); 3304 3308 … … 3307 3311 } 3308 3312 3309 function return_import_msgs(data, folderID){ 3313 function return_import_msgs(data, folder) 3314 { 3310 3315 if(data && data.error){ 3311 3316 write_msg(data.error); 3312 3317 } 3313 else{ 3318 else 3319 { 3314 3320 if(data == 'Post-Content-Length') 3315 3321 write_msg(get_lang('The size of this message has exceeded the limit (%1B).', preferences.max_attachment_size ? preferences.max_attachment_size : Element('upload_max_filesize').value)); 3316 else { /* 3322 else 3323 { /* 3317 3324 * @author Rommel Cysne (rommel.cysne@serpro.gov.br) 3318 3325 * @date 2009/05/15 … … 3321 3328 */ 3322 3329 var er = /^local_/; 3323 if ( er.test( wfolders_tree._selected.id) )3330 if ( er.test(folder.id) ) 3324 3331 { 3325 3332 alert( "Mensagens não podem ser importadas em pastas locais" ); … … 3327 3334 //cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal'); 3328 3335 } 3329 else{ 3330 write_msg(get_lang(data)); 3331 arrayJSWin["import_window"].close(); 3332 //Retira o foco do botao importar no Firefox 3333 if ( (is_mozilla)&&(!is_webkit) ){ 3334 Element("dJSWin_wfolders_bok").blur(); 3335 } 3336 if(openTab.imapBox[0] == folderID) 3336 else 3337 { 3338 if( openTab.imapBox[0] == folder.id ) 3337 3339 { 3338 3340 openTab.imapBox[0] = ''; 3339 change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption); 3340 } else{ 3341 refresh(); 3341 change_folder(folder.id, folder.caption); 3342 3342 } 3343 } 3344 } 3343 3344 refresh(); 3345 } 3346 } 3345 3347 } 3346 3348
Note: See TracChangeset
for help on using the changeset viewer.