Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

improvement: support string mask pattern in maskDefinitions #212

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

improvement: support string mask pattern in maskDefinitions #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4d50a4
improvement: support string mask pattern in maskDefinitions
alirezamirian Mar 7, 2017
b86a615
fix: react to changes of options
alirezamirian Mar 11, 2017
a05c576
fix: react to changes of options
alirezamirian Mar 11, 2017
301e21a
Merge remote-tracking branch 'origin/master'
alirezamirian Mar 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 30 additions & 24 deletions dist/mask.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* angular-ui-mask
* https://github.com/angular-ui/ui-mask
* Version: 1.8.7 - 2016-07-26T15:59:07.992Z
* Version: 1.8.7 - 2017-03-11T11:41:17.812Z
* License: MIT
*/

Expand Down Expand Up @@ -177,34 +177,35 @@ angular.module('ui.mask', [])
}
}

var linkOptions = {};

if (iAttrs.uiOptions) {
linkOptions = scope.$eval('[' + iAttrs.uiOptions + ']');
if (angular.isObject(linkOptions[0])) {
// we can't use angular.copy nor angular.extend, they lack the power to do a deep merge
linkOptions = (function(original, current) {
for (var i in original) {
if (Object.prototype.hasOwnProperty.call(original, i)) {
if (current[i] === undefined) {
current[i] = angular.copy(original[i]);
} else {
if (angular.isObject(current[i]) && !angular.isArray(current[i])) {
current[i] = angular.extend({}, original[i], current[i]);
var linkOptions = options;
scope.$watch(iAttrs.uiOptions, function(currentValue){
if(currentValue){
linkOptions = scope.$eval('[' + iAttrs.uiOptions + ']');
if (angular.isObject(linkOptions[0])) {
// we can't use angular.copy nor angular.extend, they lack the power to do a deep merge
linkOptions = (function(original, current) {
for (var i in original) {
if (Object.prototype.hasOwnProperty.call(original, i)) {
if (current[i] === undefined) {
current[i] = angular.copy(original[i]);
} else {
if (angular.isObject(current[i]) && !angular.isArray(current[i])) {
current[i] = angular.extend({}, original[i], current[i]);
}
}
}
}
}
return current;
})(options, linkOptions[0]);
} else {
linkOptions = options; //gotta be a better way to do this..
return current;
})(options, linkOptions[0]);
} else {
linkOptions = options; //gotta be a better way to do this..
}
initialize(iAttrs.uiMask);
}
} else {
linkOptions = options;
}
}, true);

iAttrs.$observe('uiMask', initialize);

if (angular.isDefined(iAttrs.uiMaskPlaceholder)) {
iAttrs.$observe('uiMaskPlaceholder', initPlaceholder);
}
Expand Down Expand Up @@ -420,7 +421,12 @@ angular.module('ui.mask', [])
maskCaretMap.push(characterCount);

maskPlaceholder += getPlaceholderChar(i - numberOfOptionalCharacters);
maskPatterns.push(linkOptions.maskDefinitions[chr]);
if(angular.isString(linkOptions.maskDefinitions[chr])){
maskPatterns.push(new RegExp(linkOptions.maskDefinitions[chr]));
}
else{
maskPatterns.push(linkOptions.maskDefinitions[chr]);
}

characterCount++;
if (!isOptional) {
Expand Down
Loading