Skip to content

Commit

Permalink
Fix Issue #64: Edit regex in urlLink filter to allow * (ampersand)
Browse files Browse the repository at this point in the history
  • Loading branch information
athana committed Dec 30, 2014
1 parent b0bee40 commit 5420e2c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/app/filters/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ define(['angular', 'jquery', 'underscore','showdown'], function(angular, $, _,Sh

module.filter('urlLink', function() {
var //URLs starting with http://, https://, or ftp://
r1 = /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gim,
r1 = /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|*])/gim,
//URLs starting with "www." (without // before it, or it'd re-link the ones done above).
r2 = /(^|[^\/])(www\.[\S]+(\b|$))/gim,
//Change email addresses to mailto:: links.
Expand Down Expand Up @@ -98,7 +98,7 @@ define(['angular', 'jquery', 'underscore','showdown'], function(angular, $, _,Sh

module.filter('urlLinkAsIcon', function() {
var //URLs starting with http://, https://, or ftp://
r1 = /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gim,
r1 = /(\b(https?|ftp):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|*])/gim,
//URLs starting with "www." (without // before it, or it'd re-link the ones done above).
r2 = /(^|[^\/])(www\.[\S]+(\b|$))/gim,
//Change email addresses to mailto:: links.
Expand Down

0 comments on commit 5420e2c

Please sign in to comment.