projects
/
gnome.introspection-doc-generator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JsTemplate/Link.js
[gnome.introspection-doc-generator]
/
JsTemplate
/
Link.js
diff --git
a/JsTemplate/Link.js
b/JsTemplate/Link.js
index
2e2d6f1
..
a8a9e1a
100644
(file)
--- a/
JsTemplate/Link.js
+++ b/
JsTemplate/Link.js
@@
-82,11
+82,11
@@
Link = XObject.define(
},
toString : function() {
},
toString : function() {
- var linkString;
+
var thisLink = this;
if (this.alias) {
var thisLink = this;
if (this.alias) {
-
linkString =
this.alias.replace(/(^|[^a-z$0-9_#.:-])([|a-z$0-9_#.:-]+)($|[^a-z$0-9_#.:-])/i,
+
return
this.alias.replace(/(^|[^a-z$0-9_#.:-])([|a-z$0-9_#.:-]+)($|[^a-z$0-9_#.:-])/i,
function(match, prematch, symbolName, postmatch) {
var symbolNames = symbolName.split("|");
var links = [];
function(match, prematch, symbolName, postmatch) {
var symbolNames = symbolName.split("|");
var links = [];
@@
-98,17
+98,16
@@
Link = XObject.define(
}
);
}
}
);
}
-
else
if (this.url) {
-
linkString =
thisLink._makeLink(this.url);
+ if (this.url) {
+
return
thisLink._makeLink(this.url);
}
}
-
else
if (this.src) {
-
linkString =
thisLink._makeSrcLink(this.src);
+ if (this.src) {
+
return
thisLink._makeSrcLink(this.src);
}
}
-
else
if (this.file) {
-
linkString =
thisLink._makeFileLink(this.file);
+ if (this.file) {
+
return
thisLink._makeFileLink(this.file);
}
}
- return linkString;
},
},
@@
-119,7
+118,7
@@
Link = XObject.define(
/** Create a link to a snother symbol. */
_makeSymbolLink : function(alias) {
/** Create a link to a snother symbol. */
_makeSymbolLink : function(alias) {
-
+ print(JSON.stringify(alias));
// look for '/' in alias..
if (/\//.test(alias)) {
var bits = alias.split('/');
// look for '/' in alias..
if (/\//.test(alias)) {
var bits = alias.split('/');
@@
-136,8
+135,9
@@
Link = XObject.define(
- var linkBase =
Link.base+ imports.JSDOC.BuildDocs.BuildDocs.symbolsDir
;
+ var linkBase =
'./'
;
var linkTo = Link.symbolSet.getSymbol(alias);
var linkTo = Link.symbolSet.getSymbol(alias);
+
var linkPath;
var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
var linkPath;
var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
@@
-205,7
+205,16
@@
Link = XObject.define(
if (!this.text) this.text = filePath;
return "<a href=\""+outFilePath+"\""+target+">"+this.text+"</a>";
if (!this.text) this.text = filePath;
return "<a href=\""+outFilePath+"\""+target+">"+this.text+"</a>";
+ },
+
+ /** very basic link... */
+ _makeLink : function(url) {
+ var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
+
+ if (!this.text) this.text = url;
+ return "<a href=\""+url+"\""+target+">"+this.text+"</a>";
}
}
+
});
});