Take string out of function. clean up code a bit

uudashr · Feb 29, 2016 · 9819f71 · 9819f71
1 parent 08cbcc6
commit 9819f71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/jquery.linkify.js b/jquery.linkify.js
@@ -4,21 +4,14 @@ function linkify(string, buildHashtagUrl, includeW3, target, noFollow) {
     relNoFollow = " rel=\"nofollow\"";
   }
 
-  string = function() {
-    var uri;
-    if (string.toLowerCase().indexOf("www.") === 0) {
-      if (!includeW3) {
-        return string;
-      }
-      uri = "http://" + string;
-    } else {
-      uri = string;
-    }
-    return "<a href=\"" + uri+ "\" target=\"" + target + "\"" + relNoFollow + ">" + string + "</a>";
-  }();
+  if (string.toLowerCase().indexOf("www.") === 0 && includeW3) {
+    string = '<a href="http://' + string + '" target="' + target + '"' + relNoFollow + '>' + string + '</a>';
+  } else {
+    string = '<a href="' + string + '" target="' + target + '"' + relNoFollow + '>' + string + '</a>';
+  }
 
   if (buildHashtagUrl) {
-    string = string.replace(/\B#(\w+)/g, "<a href=" + buildHashtagUrl("$1") +" target=\"" + target + "\"" + relNoFollow + ">#$1</a>");
+    string = string.replace(/\B#(\w+)/g, '<a href=' + buildHashtagUrl("$1") + ' target="' + target + '"' + relNoFollow + '>#$1</a>');
   }
   return string;
 }

diff --git a/jquery.linkify.min.js b/jquery.linkify.min.js