removed some more markup from function code and fixed thumbnail_macro for backwards compatibility
This commit is contained in:
parent
1068dd9727
commit
0327e048f1
1 changed files with 9 additions and 5 deletions
|
@ -215,8 +215,9 @@ function commentcounter_macro(param) {
|
||||||
param.linkto = "main";
|
param.linkto = "main";
|
||||||
if (commentCnt == 0) {
|
if (commentCnt == 0) {
|
||||||
res.write(commentCnt + (param.no ? param.no : " comments"));
|
res.write(commentCnt + (param.no ? param.no : " comments"));
|
||||||
} else {
|
}
|
||||||
openMarkupElement("a",this.createLinkParam(param));
|
else {
|
||||||
|
openMarkupElement("a", this.createLinkParam(param));
|
||||||
if (commentCnt == 1)
|
if (commentCnt == 1)
|
||||||
res.write(commentCnt + (param.one ? param.one : " comment"));
|
res.write(commentCnt + (param.one ? param.one : " comment"));
|
||||||
else
|
else
|
||||||
|
@ -234,7 +235,9 @@ function comments_macro(param) {
|
||||||
if (this.weblog.hasDiscussions() && this.count()) {
|
if (this.weblog.hasDiscussions() && this.count()) {
|
||||||
for (var i=0;i<this.size();i++) {
|
for (var i=0;i<this.size();i++) {
|
||||||
var c = this.get(i);
|
var c = this.get(i);
|
||||||
res.write("<a name=\"" + c._id + "\"></a>");
|
var linkParam = new Object();
|
||||||
|
linkParam.name = c._id;
|
||||||
|
renderMarkupElement("a", linkParam);
|
||||||
if (c.parent)
|
if (c.parent)
|
||||||
c.renderSkin("reply");
|
c.renderSkin("reply");
|
||||||
else
|
else
|
||||||
|
@ -270,11 +273,12 @@ function image_macro(param) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* macro left for backwards-compatibility
|
* macro left for backwards-compatibility
|
||||||
* calls global image_macro()
|
* calls global image_macro() as "popup"
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function thumbnail_macro(param) {
|
function thumbnail_macro(param) {
|
||||||
thumbnail_macro(param);
|
param.as = "popup";
|
||||||
|
image_macro(param);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue