JsTemplate/Link.js
authorAlan Knowles <alan@akbkhome.com>
Fri, 16 Jul 2010 07:05:42 +0000 (15:05 +0800)
committerAlan Knowles <alan@akbkhome.com>
Fri, 16 Jul 2010 07:05:42 +0000 (15:05 +0800)
JsTemplate/Link.js

index 2e2d6f1..3f1b391 100644 (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,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;
         },