X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JsTemplate%2FLink.js;h=a84e96f6eef063a8dc3ad228cafd0b0403a5e815;hp=86457a20ab5d944688cebacf4261a77ff9ea3db9;hb=d56985f1898989ac6236528f762e69837f185914;hpb=c479a727d6cb7fe30277160292e964d19b969383

diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js
index 86457a2..a84e96f 100644
--- a/JsTemplate/Link.js
+++ b/JsTemplate/Link.js
@@ -12,8 +12,8 @@ XObject  = imports.XObject.XObject;
 /** Handle the creation of HTML links to documented symbols.
 	@constructor
 */
-Link = XObject.define( 
-    function {
+Link = XObject.define(
+    function () {
         this.alias = "";
         this.src = "";
         this.file = "";
@@ -102,7 +102,7 @@ Link = XObject.define(
             
             
             
-            var linkBase = Link.base+JSDOC.publish.conf.symbolsDir;
+            var linkBase = Link.base+  imports.JSDOC.BuildDocs.BuildDocs.symbolsDir;
             var linkTo = Link.symbolSet.getSymbol(alias);
             var linkPath;
             var target = (this.targetName)? " target=\""+this.targetName+"\"" : "";
@@ -127,11 +127,11 @@ Link = XObject.define(
 
                 if (!linkTo.is("CONSTRUCTOR") && !linkTo.isNamespace) { // it's a method or property
                     linkPath = escape(linkTo.memberOf) || "_global_";
-                    linkPath += JSDOC.publish.conf.ext + "#" + Link.symbolNameToLinkName(linkTo);
+                    linkPath += import.JSDOC.Options.Options.ext + "#" + Link.symbolNameToLinkName(linkTo);
                 }
                 else {
                     linkPath = escape(linkTo.alias);
-                    linkPath += JSDOC.publish.conf.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
+                    linkPath += import.JSDOC.Options.Options.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
                 }
                 //linkPath = linkBase + linkPath;
                 fullLinkPath = linkBase + linkPath;
@@ -141,9 +141,9 @@ Link = XObject.define(
             
             var link = {linkPath: linkPath, linkText: linkText, fullLinkPath: fullLinkPath};
             
-            if (typeof JSDOC.PluginManager != "undefined") {
-                JSDOC.PluginManager.run("onSymbolLink", link);
-            }
+            //if (typeof JSDOC.PluginManager != "undefined") {
+            //    JSDOC.PluginManager.run("onSymbolLink", link);
+            //}
             
             return "<a href=\""+link.fullLinkPath+"\""+target+" roo:cls=\""+link.linkPath+"\">"+link.linkText+"</a>";
         },
@@ -156,7 +156,8 @@ Link = XObject.define(
             // transform filepath into a filename
             var srcFile = srcFilePath.replace(/\.\.?[\\\/]/g, "").replace(/[:\\\/]/g, "."); // was _
             var lsrcFile = srcFilePath.replace(/\.\.?[\\\/]/g, "").replace(/[:\\\/]/g, ".");
-            var outFilePath = Link.base + JSDOC.publish.conf.srcDir + srcFile.replace(/.js$/, '') + JSDOC.publish.conf.ext;
+            var outFilePath = Link.base + '/symbols/' +  srcFile.replace(/.js$/, '') + 
+                import.JSDOC.Options.Options.publishExt;
             
             if (!this.text) this.text = FilePath.fileName(srcFilePath);
             return "<a href=\""+outFilePath+"\""+target+" roo:cls=\"src/"+lsrcFile+"\">"+this.text+"</a>";