forked from hamtie/angular.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(linky): allow optional 'target' argument
Closes angular#1443
- Loading branch information
Showing
2 changed files
with
30 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
* plain email address links. | ||
* | ||
* @param {string} text Input text. | ||
* @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in. | ||
* @returns {string} Html-linkified text. | ||
* | ||
* @usage | ||
|
@@ -24,6 +25,7 @@ | |
'mailto:[email protected],\n'+ | ||
'[email protected],\n'+ | ||
'and one more: ftp://127.0.0.1/.'; | ||
$scope.snippetWithTarget = 'http://angularjs.org/'; | ||
} | ||
</script> | ||
<div ng-controller="Ctrl"> | ||
|
@@ -43,6 +45,15 @@ | |
<div ng-bind-html="snippet | linky"></div> | ||
</td> | ||
</tr> | ||
<tr id="linky-target"> | ||
<td>linky target</td> | ||
<td> | ||
<pre><div ng-bind-html="snippetWithTarget | linky:'_blank'"><br></div></pre> | ||
</td> | ||
<td> | ||
<div ng-bind-html="snippetWithTarget | linky:'_blank'"></div> | ||
</td> | ||
</tr> | ||
<tr id="escaped-html"> | ||
<td>no filter</td> | ||
<td><pre><div ng-bind="snippet"><br></div></pre></td> | ||
|
@@ -75,14 +86,19 @@ | |
toBe('new <a href="http://link">http://link</a>.'); | ||
expect(using('#escaped-html').binding('snippet')).toBe('new http://link.'); | ||
}); | ||
it('should work with the target property', function() { | ||
expect(using('#linky-target').binding("snippetWithTarget | linky:'_blank'")). | ||
toBe('<a target="_blank" href="http://angularjs.org/">http://angularjs.org/</a>'); | ||
}); | ||
</doc:scenario> | ||
</doc:example> | ||
*/ | ||
angular.module('ngSanitize').filter('linky', function() { | ||
var LINKY_URL_REGEXP = /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s\.\;\,\(\)\{\}\<\>]/, | ||
MAILTO_REGEXP = /^mailto:/; | ||
|
||
return function(text) { | ||
return function(text, target) { | ||
if (!text) return text; | ||
var match; | ||
var raw = text; | ||
|
@@ -91,14 +107,19 @@ angular.module('ngSanitize').filter('linky', function() { | |
var writer = htmlSanitizeWriter(html); | ||
var url; | ||
var i; | ||
var properties = {}; | ||
if (angular.isDefined(target)) { | ||
properties.target = target; | ||
} | ||
while ((match = raw.match(LINKY_URL_REGEXP))) { | ||
// We can not end in these as they are sometimes found at the end of the sentence | ||
url = match[0]; | ||
// if we did not match ftp/http/mailto then assume mailto | ||
if (match[2] == match[3]) url = 'mailto:' + url; | ||
i = match.index; | ||
writer.chars(raw.substr(0, i)); | ||
writer.start('a', {href:url}); | ||
properties.href = url; | ||
writer.start('a', properties); | ||
writer.chars(match[0].replace(MAILTO_REGEXP, '')); | ||
writer.end('a'); | ||
raw = raw.substring(i + match[0].length); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,4 +24,11 @@ describe('linky', function() { | |
expect(linky("send email to [email protected], but")). | ||
toEqual('send email to <a href="mailto:[email protected]">[email protected]</a>, but'); | ||
}); | ||
|
||
it('should handle target:', function() { | ||
expect(linky("http://example.com", "_blank")). | ||
toEqual('<a target="_blank" href="http://example.com">http://example.com</a>') | ||
expect(linky("http://example.com", "someNamedIFrame")). | ||
toEqual('<a target="someNamedIFrame" href="http://example.com">http://example.com</a>') | ||
}); | ||
}); |