Ignore:
Timestamp:
06/30/11 19:00:36 (13 years ago)
Author:
fernando-alberto
Message:

Ticket #1269 - Mergiando revisoes do brach22 de rev4447 ate rev4643

Location:
sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js

    • Property svn:ignore set to
      .filter.js.swp
      .filters.js.swp
      .filters.js.swo
      .filter_old.js.swp
      .drag_area.js.swp
      .main.js.swp
      .messages_controller.js.swp
      .local_messages.j.swp
      .local_messages.js.swp
      .wfolders.js.swp
  • sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/rich_text_editor.js

    r4379 r4644  
    163163 
    164164        if (source) { 
     165                var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + this.id ); 
    165166                if (is_ie){ 
    166167                        connector.loadScript('html2xhtml'); 
    167168                        html = frames[this.editor].document.body; 
    168169                        var xhtml = get_xhtml(html, 'en', 'iso-8859-1'); 
     170                        xhtml = xhtml.replace( /<br\s*\/?>/mg, "\n" ).replace( /(<([^>]+)>)/ig, '' ).replace( /^[\n ]+|[\n ]+$/g, '' ); 
     171                        if ( ! mobile_device && xhtml != '' && ! ( mail_as_plain.checked = confirm( get_lang( 'The text format will be lost' ) + '.' ) ) ) 
     172                                return false; 
    169173                        frames[this.editor].document.body.innerText = xhtml; 
    170174                        document.getElementById("table_richtext_toolbar").style.visibility="hidden"; 
    171175                } 
    172176                else{ 
    173                         var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + this.id ); 
    174  
    175177                        html = document.createTextNode( editor.contentWindow.document.body.innerHTML ); 
    176178                        html = html.nodeValue.replace( /<br\s*\/?>/mg, "\n" ).replace( /(<([^>]+)>)/ig, '' ).replace( /^[\n ]+|[\n ]+$/g, '' ); 
Note: See TracChangeset for help on using the changeset viewer.