Changeset 940

Timestamp:

01/22/08 22:34:07 (5 years ago)

Author:

ray

Message:

#1130 baseHref not correctly treated -- new solution

Files:

• trunk/XinhaCore.js (modified) (2 diffs)

trunk/XinhaCore.js

@@ -705 +705 @@
    *  your absolute links, your external string might be some special code, say "{server_url}"
    *  an you say that the internal represenattion of that should be http://your.server/<br />
-   *  Example:  <code>{'external_string' : 'internal_string'}</code><br />
+   *  Example:  <code>{ 'html_string' : 'wysiwyg_string' }</code><br />
    *  Default: <code>{}</code> (empty)
    *  @type Object
    */
-  this.specialReplacements = {}; // { 'external_string' : 'internal_string' }
+  this.specialReplacements = {}; //{ 'html_string' : 'wysiwyg_string' }
 
  /** Set to true if you want Word code to be cleaned upon Paste. This only works if 
@@ -5028 +5028 @@
     if ( typeof this.config.baseHref != 'undefined' && this.config.baseHref !== null )
     {
-      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/\/[^\/]*$/, '/')) + ")", 'g' );
+      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/([^\/]\/)(?=.+\.)[^\/]*$/, "$1")) + ")", 'g' );
     }
     else