X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JsTemplate%2FLink.js;h=3f1b39172b2e595032f3029b51312b14dc2f0bdb;hp=383ee918cb930f5512a21c97814d6dbc71175b23;hb=d31e045238842d9bb620f65d05c1c246808928fd;hpb=d90ce064d76bb78da4e49298c630fe26fe968dd9 diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js index 383ee91..3f1b391 100644 --- a/JsTemplate/Link.js +++ b/JsTemplate/Link.js @@ -38,7 +38,7 @@ Link = XObject.define( */ alias : "", /** - * alias {String} not sure? + * src {String} not sure? */ src : "", file : "", @@ -86,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 = []; @@ -98,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; },