Changeset 502

Timestamp:

04/30/06 22:49:36 (7 years ago)

Author:

wymsy

Message:

fix for ticket #487

I had put this patch in the GetHtml plugin in changeset:478, but it really belongs in the core.

Location:

trunk

Files:

• htmlarea.js (modified) (1 diff)
• plugins/GetHtml/get-html.js (modified) (1 diff)

trunk/htmlarea.js

@@ -5159 +5159 @@
   if ( typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors )
   {
-    var stripRe = new RegExp(document.location.href.replace(HTMLArea.RE_Specials, '\\$1') + '(#[^\'" ]*)', 'g');
+    var stripRe = new RegExp(document.location.href.replace(/&/g,'&').replace(HTMLArea.RE_Specials, '\\$1') + '(#[^\'" ]*)', 'g');
     html = html.replace(stripRe, '$1');
   }

trunk/plugins/GetHtml/get-html.js

@@ -195 +195 @@
 };
 
-//fix obscure case; stripSelfNamedAnchors fails in IE if location.href includes a query string with '&' in it
-HTMLArea.prototype._origFixRelativeLinks = HTMLArea.prototype.fixRelativeLinks;
-HTMLArea.prototype.fixRelativeLinks = function(html)
-{
-  if(typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors)
-  {
-    var stripRe = new RegExp(document.location.href.replace(/&/g,'&').replace(HTMLArea.RE_Specials, '\\$1') + '(#[^\'" ]*)', 'g');
-    html = html.replace(stripRe, '$1');
-  }
-  html = this._origFixRelativeLinks(html);
-  return html;
-};
-
 //override (hack) outwardHtml() to handle onclick suppression
 HTMLArea.prototype._origOutwardHtml = HTMLArea.prototype.outwardHtml;