Merge pull request #138 from RafaelTaranto/fix-config-provider

maskDefinitions method was missing in configProvider - issue #135

Author: lukepfeiffer10

README.md

@@ -55,7 +55,7 @@ angular.module('myApp', [uiMask, ...]);
 ### Customizing
 You can customize several behaviors of ui-mask by taking advantage of the `ui-options` object. Declare `ui-options` as an additional attribute on the same element where you declare `ui-mask`.
 
-Inside of `ui-options`, you can customize these four properties:
+Inside of `ui-options`, you can customize these five properties:
 
 * `maskDefinitions` - default: `{
                 '9': /\d/,

src/mask.js

@@ -17,6 +17,9 @@ angular.module('ui.mask', [])
         .provider('uiMask.Config', function() {
             var options = {};
 
+            this.maskDefinitions = function(maskDefinitions) {
+                return options.maskDefinitions = maskDefinitions;
+            };
             this.clearOnBlur = function(clearOnBlur) {
                 return options.clearOnBlur = clearOnBlur;
             };
@@ -31,9 +34,12 @@ angular.module('ui.mask', [])
             };
             this.$get = ['uiMaskConfig', function(uiMaskConfig) {
                 var tempOptions = uiMaskConfig;
-                for(var prop in options)
-                {
-                    tempOptions[prop] = options[prop];
+                for(var prop in options) {
+                    if (angular.isObject(options[prop]) && !angular.isArray(options[prop])) {
+                        angular.extend(tempOptions[prop], options[prop]);
+                    } else {
+                        tempOptions[prop] = options[prop];
+                    }
                 }
 
                 return tempOptions;

test/maskSpec.js

@@ -794,17 +794,24 @@ describe("uiMask", function () {
   describe("Configuration Provider", function() {
     it("should return default values", inject(function($injector) {
       var service = $injector.invoke(uiMaskConfigProvider.$get);
+      expect(service.maskDefinitions).toEqual({'9': /\d/, 'A': /[a-zA-Z]/, '*': /[a-zA-Z0-9]/ });
       expect(service.clearOnBlur).toEqual(true);
       expect(service.clearOnBlurPlaceholder).toEqual(false);
+      expect(service.eventsToHandle).toEqual(['input', 'keyup', 'click', 'focus']);
       expect(service.addDefaultPlaceholder).toEqual(true);
     }));
 
     it("should merge default values with configured values", inject(function($injector) {
+      uiMaskConfigProvider.maskDefinitions({'7': /\d/});
       uiMaskConfigProvider.clearOnBlur(false);
+      uiMaskConfigProvider.clearOnBlurPlaceholder(true);
+      uiMaskConfigProvider.eventsToHandle(['input', 'keyup']);
       uiMaskConfigProvider.addDefaultPlaceholder(false);
       var service = $injector.invoke(uiMaskConfigProvider.$get);
+      expect(service.maskDefinitions).toEqual({'7': /\d/, '9': /\d/, 'A': /[a-zA-Z]/, '*': /[a-zA-Z0-9]/ });
       expect(service.clearOnBlur).toEqual(false);
-      expect(service.clearOnBlurPlaceholder).toEqual(false);
+      expect(service.clearOnBlurPlaceholder).toEqual(true);
+      expect(service.eventsToHandle).toEqual(['input', 'keyup']);
       expect(service.addDefaultPlaceholder).toEqual(false);
     }));
   });