- Timestamp:
- 11/27/12 09:52:35 (11 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/main.js
r7567 r7568 2298 2298 // Insert the signature automaticaly at message body if use_signature preference is set 2299 2299 if (preferences.use_signature == "1"){ 2300 RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>' + block_quoted_body,true); 2300 var body_text = '<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>' + block_quoted_body; 2301 if (preferences.plain_text_editor == "1"){ 2302 body_text = "\n\n"+remove_tags(body_text); 2303 $("#body_"+new_border_ID).val(body_text, true); 2304 } else { 2305 RichTextEditor.setInitData(new_border_ID, body_text, true); 2306 } 2301 2307 }else{ 2302 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>'+ block_quoted_body,true); 2308 body_text = '<div><br type="_moz"></div>'+ block_quoted_body; 2309 if (preferences.plain_text_editor == "1"){ 2310 body_text = "\n\n"+remove_tags(body_text); 2311 $("#body_"+new_border_ID).val(body_text, true); 2312 } else { 2313 RichTextEditor.setInitData(new_border_ID, body_text, true); 2314 } 2303 2315 } 2304 2316 break; … … 2401 2413 2402 2414 if (preferences.use_signature == "1"){ 2403 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body,true); 2415 var body_text = '<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ block_quoted_body; 2416 if (preferences.plain_text_editor == "1"){ 2417 body_text = "\n\n"+remove_tags(body_text); 2418 $("#body_"+new_border_ID).val(body_text, true); 2419 } 2420 else { 2421 RichTextEditor.setInitData(new_border_ID, body_text, true); 2422 } 2404 2423 }else{ 2405 RichTextEditor.setInitData(new_border_ID,block_quoted_body,true); 2424 var body_text = '<div><br type="_moz"></div><div><br type="_moz"></div>' + block_quoted_body; 2425 if (preferences.plain_text_editor == "1"){ 2426 body_text = "\n\n"+remove_tags(body_text); 2427 $("#body_"+new_border_ID).val(body_text, true); 2428 } 2429 else { 2430 RichTextEditor.setInitData(new_border_ID, body_text, true); 2431 } 2406 2432 } 2407 2433 … … 2418 2444 if (Element("attachments_" + border_ID)) 2419 2445 addOriginalAttachments(new_border_ID,border_ID); 2420 2446 2421 2447 // Insert the signature automaticaly at message body if use_signature preference is set 2422 2448 if (preferences.use_signature == "1"){ 2423 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 2424 RichTextEditor.setInitData(new_border_ID,'<div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 2425 content.find(".to").focus(); 2449 var body_text = '<div><br type="_moz"></div><div><br type="_moz"></div>' + signature + '<div><br type="_moz"></div>'+ make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc); 2450 if (preferences.plain_text_editor == "1"){ 2451 body_text = "\n\n"+remove_tags(body_text); 2452 $("#body_"+new_border_ID).val(body_text); 2453 } 2454 else { 2455 RichTextEditor.setInitData(new_border_ID, body_text, true); 2456 } 2426 2457 } 2427 2458 else{ 2428 RichTextEditor.setInitData(new_border_ID,make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 2429 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>'+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc)); 2430 content.find(".to").focus(); 2431 } 2459 var body_text = '<div><br type="_moz"></div><div><br type="_moz"></div>'+make_forward_body(data.body, data.to, data.date, data.subject, data.to_all, data.cc); 2460 if (preferences.plain_text_editor == "1"){ 2461 body_text = "\n\n"+remove_tags(body_text); 2462 $("#body_"+new_border_ID).val(body_text); 2463 } 2464 else { 2465 RichTextEditor.setInitData(new_border_ID, body_text, true); 2466 } 2467 } 2468 content.find(".to").focus(); 2432 2469 2433 2470 break; … … 2457 2494 // Insert the signature automaticaly at message body if use_signature preference is set 2458 2495 if (preferences.use_signature == "1"){ 2459 $("#body_"+new_border_ID).val('<div><br type="_moz"></div><div><br type="_moz"></div>' + signature); 2460 RichTextEditor.setInitData(new_border_ID, '<div><br type="_moz"></div>' + signature); 2496 var signature_text = '<div><br type="_moz"></div><div><br type="_moz"></div>' + signature; 2497 if (preferences.plain_text_editor == "1"){ 2498 signature_text = "\n\n"+remove_tags(signature_text); 2499 $("#body_"+new_border_ID).val(signature_text); 2500 } 2501 else { 2502 RichTextEditor.setInitData(new_border_ID, signature_text, true); 2503 } 2461 2504 content.find(".to").focus(); 2462 2505 } 2463 2506 else 2464 2507 content.find('[name="input_to"]').focus(); 2508 2465 2509 break; 2466 2510 case "edit": 2467 btnSaveVerify();2511 btnSaveVerify(); 2468 2512 2469 2513 if(flagged == 'F') … … 2524 2568 if (Element("attachments_" + border_ID)) 2525 2569 addOriginalAttachments(new_border_ID,border_ID); 2526 RichTextEditor.setInitData(new_border_ID, data.body, 'edit'); 2570 2571 if (preferences.plain_text_editor == "1"){ 2572 data.body = remove_tags(data.body); 2573 $("#body_"+new_border_ID).val(data.body); 2574 } 2575 else { 2576 RichTextEditor.setInitData(new_border_ID, data.body, 'edit'); 2577 } 2527 2578 2528 2579 uidsSave[new_border_ID].push(new_border_ID); … … 5375 5426 } 5376 5427 5428 /* 5429 * @author Marcos Luiz Wilhelm (marcoswilhelm@gmail.com) 5430 * @date 2012/11/26 5431 * @Remove HTML tags in the email body when the simple editor is used. 5432 */ 5433 function remove_tags (body){ 5434 var div = $("<div>").attr("display", "none"); 5435 div.html(body); 5436 div.html($.trim(div.text().replace(/[\t]+/g, '').replace(/[\n]+/g, '\n'))); 5437 return div.text(); 5438 } 5439 5377 5440 DataLayer.links('message'); 5378 5441 DataLayer.poll('message',30); -
trunk/expressoMail1_2/js/rich_text_editor.js
r7522 r7568 213 213 RichTextEditor.plain[id] = active; 214 214 var content = $("#content_id_"+id); 215 var div = $("<div>").attr("display", "none");215 //var div = $("<div>").attr("display", "none"); 216 216 if(active === true) 217 217 { … … 219 219 var height = document.body.scrollHeight; 220 220 height -= 330; 221 $('#body_'+id).height(height); 222 div.html($('#body_'+id).val()); 223 /*Remove as tags html, tabulações e quebras de linha quando for utilizado o editor de texto simples*/ 224 div.html($.trim(div.text().replace(/[\t]+/g, '').replace(/[\n]+/g, '\n'))); 225 /*Insere o texto sem formatação no textarea*/ 226 $('#body_'+id).val(div.text()); 221 //Insere o texto sem formatação no textarea 222 var text_body = remove_tags($('#body_'+id).val()); 223 $('#body_'+id).val(text_body); 227 224 228 225 $('#body_'+id).keydown(function(event) { … … 238 235 RichTextEditor.active('body_'+id, id); 239 236 /*Insere somente quebras de linha para que o texto convertido não fique todo em uma linha só*/ 240 div.html($('#body_'+id).val().replace(/[\n]+/g, '<br>'));241 $('#body_'+id).val( div.html());237 var text_body = $('#body_'+id).val().replace(/[\n]+/g, '<br>'); 238 $('#body_'+id).val(text_body); 242 239 } 243 240 }
Note: See TracChangeset
for help on using the changeset viewer.