JSDOC/TokenReader.js

[gnome.introspection-doc-generator] / JsTemplate / Link.js

diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js
index 5be54d1..1eb9c34 100644 (file)
--- a/JsTemplate/Link.js
+++ b/JsTemplate/Link.js
@@ -117,8 +117,9 @@ Link = XObject.define(
         
         
         /** Create a link to a snother symbol. */
-        _makeSymbolLink : function(alias) {
-            
+        _makeSymbolLink : function(alias) 
+        {
+            //print(JSON.stringify(alias));
             // look for '/' in alias..
             if (/\//.test(alias)) {
                 var bits = alias.split('/');
@@ -135,8 +136,9 @@ 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+"\"" : "";
             
@@ -160,11 +162,11 @@ Link = XObject.define(
 
                 if (!linkTo.is("CONSTRUCTOR") && !linkTo.isNamespace) { // it's a method or property
                     linkPath = escape(linkTo.memberOf) || "_global_";
-                    linkPath += imports.JSDOC.Options.Options.ext + "#" + Link.symbolNameToLinkName(linkTo);
+                    linkPath += '.html#' + Link.symbolNameToLinkName(linkTo);
                 }
                 else {
                     linkPath = escape(linkTo.alias);
-                    linkPath += imports.JSDOC.Options.Options.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
+                    linkPath += '.html' + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
                 }
                 //linkPath = linkBase + linkPath;
                 fullLinkPath = linkBase + linkPath;
@@ -207,13 +209,11 @@ Link = XObject.define(
         },
         
           /** very basic link... */
-        _makeFileLink : function(filePath) {
+        _makeLink : function(url) {
             var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
-                
-            var outFilePath =  Link.base + filePath;
-
-            if (!this.text) this.text = filePath;
-            return "<a href=\""+outFilePath+"\""+target+">"+this.text+"</a>";
+             
+            if (!this.text) this.text = url;
+            return "<a href=\""+url+"\""+target+">"+this.text+"</a>";
         }
         
 });