render_action: fixed problem with regex parsing of links with anchors
This commit is contained in:
parent
544c791ddc
commit
d5add243c7
1 changed files with 5 additions and 4 deletions
|
@ -55,12 +55,13 @@ function getPage (obj, action, backPath) {
|
||||||
var str = res.popStringBuffer ();
|
var str = res.popStringBuffer ();
|
||||||
// get the baseURI out of the url and replace
|
// get the baseURI out of the url and replace
|
||||||
// it with the given relative prefix
|
// it with the given relative prefix
|
||||||
var reg = new RegExp ("href=\"" + this.href ("") + "([^\"]+)\"");
|
// (keep anchors in regex!)
|
||||||
|
var reg = new RegExp ("href=\"" + this.href ("") + "([^\"#]+)([^\"]*)\"");
|
||||||
reg.global = true;
|
reg.global = true;
|
||||||
str = str.replace (reg, "href=\"" + backPath + "$1.html\"");
|
str = str.replace (reg, "href=\"" + backPath + "$1.html$2\"");
|
||||||
var reg = new RegExp ("src=\"" + this.href ("") + "([^\"]+)\"");
|
var reg = new RegExp ("src=\"" + this.href ("") + "([^\"#]+)([^\"]*)\"");
|
||||||
reg.global = true;
|
reg.global = true;
|
||||||
str = str.replace (reg, "src=\"" + backPath + "$1.html\"");
|
str = str.replace (reg, "src=\"" + backPath + "$1.html$2\"");
|
||||||
// shorten links, so that function files can move up one directory
|
// shorten links, so that function files can move up one directory
|
||||||
// in the hierarchy
|
// in the hierarchy
|
||||||
var reg = new RegExp ("(prototype_[^/]+/[^/]+)/main.html");
|
var reg = new RegExp ("(prototype_[^/]+/[^/]+)/main.html");
|
||||||
|
|
Loading…
Add table
Reference in a new issue