Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-04-27 18:04:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ngPattern): allow modifiers on inline ng-pattern

Browse source 
Add support for regex modifiers on inline `ng-pattern`.
`ng-pattern="/regex/i"` now validates correctly.

Closes #1437
This commit is contained in:
austingreco 2013-03-29 23:45:53 -05:00 committed by Vojta Jina
parent a91405889f
commit 12b6deb1ce
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ng/directive/input.js
View file

@ -439,7 +439,8 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
// pattern validator // pattern validator
var pattern = attr.ngPattern, var pattern = attr.ngPattern,
patternValidator; patternValidator,
match;
var validate = function(regexp, value) { var validate = function(regexp, value) {
if (isEmpty(value) || regexp.test(value)) { if (isEmpty(value) || regexp.test(value)) {
@ -452,8 +453,9 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
}; };
if (pattern) { if (pattern) {
if (pattern.match(/^\/(.*)\/$/)) { match = pattern.match(/^\/(.*)\/([gim]*)$/);
pattern = new RegExp(pattern.substr(1, pattern.length - 2)); if (match) {
pattern = new RegExp(match[1], match[2]);
patternValidator = function(value) { patternValidator = function(value) {
return validate(pattern, value) return validate(pattern, value)
}; };

12
test/ng/directive/inputSpec.js
View file

@ -476,6 +476,18 @@ describe('input', function() {
}); });
it('should validate in-lined pattern with modifiers', function() {
compileInput('<input type="text" ng-model="value" ng-pattern="/^abc?$/i" />');
scope.$digest();
changeInputValueTo('aB');
expect(inputElm).toBeValid();
changeInputValueTo('xx');
expect(inputElm).toBeInvalid();
});
it('should validate pattern from scope', function() { it('should validate pattern from scope', function() {
compileInput('<input type="text" ng-model="value" ng-pattern="regexp" />'); compileInput('<input type="text" ng-model="value" ng-pattern="regexp" />');
scope.regexp = /^\d\d\d-\d\d-\d\d\d\d$/; scope.regexp = /^\d\d\d-\d\d-\d\d\d\d$/;