X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JsTemplate%2FLink.js;h=87f3cf60d286d789d326730618abce54ed8cb771;hp=b723d785da42a8eeab242397c7bb39d06ba2444c;hb=878ce7ce54e19ea4de3b67389401eea4b4ee3dea;hpb=093bcf18fbd86f87213384e898d5a13918c12a80

diff --git a/JsTemplate/Link.js b/JsTemplate/Link.js
index b723d78..87f3cf6 100644
--- a/JsTemplate/Link.js
+++ b/JsTemplate/Link.js
@@ -13,52 +13,80 @@ XObject  = imports.XObject.XObject;
 	@constructor
 */
 Link = XObject.define(
-    function () {
-        this.alias = "";
-        this.src = "";
-        this.file = "";
-        this.text = "";
-        this.innerName = "";
-        this.classLink = false;
-        this.targetName = "";
+    /*
+    * constructor
+    */ 
+    function (opts) {
+        XObject.extend(this,opts);
         
-        this.target = function(targetName) {
+    }, 
+    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 : "",
+        
+        innerName : "",
+        classLink : false,
+        targetName : "",
+    
+        
+        
+        target : function(targetName) {
             if (typeof(targetName) != 'undefined') this.targetName = targetName;
             return this;
-        }
-        this.inner = function(inner) {
+        },
+        inner : function(inner) {
             if (typeof(inner) != 'undefined') this.innerName = inner;
             return this;
-        }
-        this.withText = function(text) {
+        },
+        withText : function(text) {
             if (typeof(text) != 'undefined') this.text = text;
             return this;
-        }
-        this.toSrc = function(filename) {
+        },
+        toSrc : function(filename) {
             if (typeof(filename) != 'undefined') this.src = filename;
+            
             return this;
-        }
-        this.toSymbol = function(alias) {
+        },
+        toSymbol : function(alias) {
             if (typeof(alias) != 'undefined') {
                 this.alias = new String(alias);
             }
             return this;
-        }
-        this.toClass = function(alias) {
+        },
+        toClass : function(alias) {
             this.classLink = true;
             return this.toSymbol(alias);
-        }
-        this.toFile = function(file) {
+        },
+        toFile : function(file) {
             if (typeof(file) != 'undefined') this.file = file;
             return this;
-        }
+        },
         
-        this.toString = function() {
-            var linkString;
+        toString : function() {
+    
             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 = [];
@@ -70,18 +98,23 @@ 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;
-        }
-    }, 
-    Object,
-    {
+        },
+        
+        
+        
+        
+        
+        
         
         /** Create a link to a snother symbol. */
         _makeSymbolLink : function(alias) {
@@ -127,11 +160,11 @@ Link = XObject.define(
 
                 if (!linkTo.is("CONSTRUCTOR") && !linkTo.isNamespace) { // it's a method or property
                     linkPath = escape(linkTo.memberOf) || "_global_";
-                    linkPath += import.JSDOC.Options.Options.ext + "#" + Link.symbolNameToLinkName(linkTo);
+                    linkPath += imports.JSDOC.Options.Options.ext + "#" + Link.symbolNameToLinkName(linkTo);
                 }
                 else {
                     linkPath = escape(linkTo.alias);
-                    linkPath += import.JSDOC.Options.Options.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
+                    linkPath += imports.JSDOC.Options.Options.ext + (this.classLink? "":"#" + Link.hashPrefix + "constructor");
                 }
                 //linkPath = linkBase + linkPath;
                 fullLinkPath = linkBase + linkPath;
@@ -156,10 +189,10 @@ 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$/, '') + 
-                import.JSDOC.Options.Options.ext;
+            var outFilePath = Link.base + '/symbols/' +  srcFile.replace(/.js$/, '') + 
+                imports.JSDOC.Options.Options.publishExt;
             
-            if (!this.text) this.text = FilePath.fileName(srcFilePath);
+            if (!this.text) this.text = srcFilePath; //FilePath.fileName(srcFilePath);
             return "<a href=\""+outFilePath+"\""+target+" roo:cls=\"src/"+lsrcFile+"\">"+this.text+"</a>";
         },