Changeset 928

Show
Ignore:
Timestamp:
01/08/08 04:02:56 (5 years ago)
Author:
gogo
Message:

ticket:993 - move pageStyle to over ride pageStylesheets
ticket:961 - make fixRelativeLinks work better with standard compliant baseHref, I'm pretty sure this will be OK, we can't put off changing it forever.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/XinhaCore.js

    r921 r928  
    192192  if ( Xinha.is_opera ) 
    193193  { 
    194     alert("Sorry, Opera is not yet supported by Xinha."); 
    195   } 
    196   return Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5; 
     194    // alert("Sorry, Opera is not yet supported by Xinha."); 
     195    return false; 
     196  } 
     197  return Xinha.is_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5; 
    197198}; 
    198199/** Cache result of checking for browser support 
    … …  
    29512952    html += Xinha.addCoreCSS(); 
    29522953     
    2953     if ( editor.config.pageStyle ) 
    2954     { 
    2955       html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>"; 
    2956     } 
    2957  
    29582954    if ( typeof editor.config.pageStyleSheets !== 'undefined' ) 
    29592955    { 
    … …  
    29672963      } 
    29682964    } 
     2965     
     2966    if ( editor.config.pageStyle ) 
     2967    { 
     2968      html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>"; 
     2969    } 
     2970     
    29692971    html += "</head>\n"; 
    2970     html += "<body>\n"; 
     2972    html += "<body" + (editor.config.bodyID ? (" id=\"" + editor.config.bodyID + "\"") : '') + ">\n"; 
    29712973    html +=   editor.inwardHtml(editor._textArea.value); 
    29722974    html += "</body>\n"; 
    … …  
    50255027    if ( typeof this.config.baseHref != 'undefined' && this.config.baseHref !== null ) 
    50265028    { 
    5027       baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref) + ")", 'g' ); 
     5029      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/\/[^\/]*$/, '/')) + ")", 'g' ); 
    50285030    } 
    50295031    else 
    … …  
    59996001  req.open('POST', url, true); 
    60006002  req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'+(Xinha._postback_send_charset ? '; charset=UTF-8' : '')); 
     6003 
    60016004  //alert(content); 
    60026005  req.send(content);