X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JsTemplate%2FLink.js;h=3f1b39172b2e595032f3029b51312b14dc2f0bdb;hp=888f3a211a9f5113c179bb6b02b21c18e76064b1;hb=d31e045238842d9bb620f65d05c1c246808928fd;hpb=e2775684853d2377df9e4ccd0a80dc7fc23efe0f diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js index 888f3a2..3f1b391 100644 --- a/JsTemplate/Link.js +++ b/JsTemplate/Link.js @@ -23,10 +23,26 @@ Link = XObject.define( Object, { + /** + * url {String} url for link.. + */ + url: "", + /** + * text {String} text to show on link. + */ + + text : "", + + /** + * alias {String} not sure? + */ alias : "", + /** + * src {String} not sure? + */ src : "", file : "", - text : "", + innerName : "", classLink : false, targetName : "", @@ -70,7 +86,7 @@ Link = XObject.define( 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 = []; @@ -82,14 +98,16 @@ Link = XObject.define( } ); } - else if (this.src) { - linkString = thisLink._makeSrcLink(this.src); + if (this.url) { + return thisLink._makeLink(this.url); + } + 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; },