X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JsTemplate%2FLink.js;h=a9245152d43b90fe6e2f7e11ac9ea28895dca846;hp=2e2d6f1f57f28f1af60e16483a294c8e5a3c0c2e;hb=1c2e9a6c4fd2d74462966002e6781ae0b5c9a714;hpb=3af26e7f7a33e18cb4f756df6da99966731753c2

diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js
index 2e2d6f1..a924515 100644
--- a/JsTemplate/Link.js
+++ b/JsTemplate/Link.js
@@ -82,11 +82,11 @@ Link = XObject.define(
         },
         
         toString : function() {
-            var linkString;
+    
             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,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;
         },
         
         
@@ -136,7 +135,7 @@ Link = XObject.define(
             
             
             
-            var linkBase = Link.base+  imports.JSDOC.BuildDocs.BuildDocs.symbolsDir;
+            var linkBase = './';
             var linkTo = Link.symbolSet.getSymbol(alias);
             var linkPath;
             var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
@@ -205,7 +204,16 @@ Link = XObject.define(
 
             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>";
         }
+        
 });