提交 3d4d60f5 编写于 作者: D Devil

debug

上级 2afea94d
...@@ -1339,6 +1339,10 @@ function UrlFieldReplace(field, value, url) ...@@ -1339,6 +1339,10 @@ function UrlFieldReplace(field, value, url)
last = (last.indexOf('/') >= 0) ? last.substr(last.indexOf('/')) : ''; last = (last.indexOf('/') >= 0) ? last.substr(last.indexOf('/')) : '';
if(value === null) if(value === null)
{ {
if(first.substr(-1) == '/')
{
first = first.substr(0, first.length-1);
}
url = first+last+ext; url = first+last+ext;
} else { } else {
url = first+field+'/'+value+last+ext; url = first+field+'/'+value+last+ext;
...@@ -1354,21 +1358,16 @@ function UrlFieldReplace(field, value, url) ...@@ -1354,21 +1358,16 @@ function UrlFieldReplace(field, value, url)
for(var i in params_all) for(var i in params_all)
{ {
var temp = params_all[i].split('='); var temp = params_all[i].split('=');
if(temp.length >= 2) if(temp.length >= 2)
{ {
if(i > 0)
{
p += '&';
}
if(temp[0] == field) if(temp[0] == field)
{ {
if(value !== null) if(value !== null)
{ {
p += field+'='+value; p += '&'+field+'='+value;
} }
} else { } else {
p += params_all[i]; p += '&'+params_all[i];
} }
} }
} }
...@@ -1380,13 +1379,25 @@ function UrlFieldReplace(field, value, url) ...@@ -1380,13 +1379,25 @@ function UrlFieldReplace(field, value, url)
p = exts+'&'+field+'='+value; p = exts+'&'+field+'='+value;
} }
} }
url = str+(ext.substr(0, ext.indexOf('?')))+'?'+p; url = str+(ext.substr(0, ext.indexOf('?')))
if((p || null) != null)
{
if(p.substr(0, 1) == '&')
{
p = p.substr(1);
}
url += '?'+p;
}
} else { } else {
if(value === null) if(value === null)
{ {
url = str+ext; url = str+ext;
} else { } else {
url = str+'/'+field+'/'+value+ext; if(str.substr(-1) != '/')
{
str += '/';
}
url = str+field+'/'+value+ext;
} }
} }
} }
...@@ -1397,11 +1408,6 @@ function UrlFieldReplace(field, value, url) ...@@ -1397,11 +1408,6 @@ function UrlFieldReplace(field, value, url)
} }
} }
// 多余的双斜杠处理、这里防止://被处理 首先换成特殊字符再换回来
url = url.replace(/\:\/\//ig, '{--re--join--re--}');
url = url.replace(/\/\//ig, '/');
url = url.replace(/\{\-\-re\-\-join\-\-re\-\-\}/ig, '://');
return url+anchor; return url+anchor;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册