v8.2.1

formly-js · May 15, 2016 · 56ecbf5 · 56ecbf5
2 parents 73c85fe + 64a8694
commit 56ecbf5
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 13 deletions.
diff --git a/dist/formly.js b/dist/formly.js
@@ -1,5 +1,5 @@
 /*!
-* angular-formly JavaScript Library v8.2.0
+* angular-formly JavaScript Library v8.2.1
 *
 * @license MIT (http://license.angular-formly.com)
 *
@@ -157,7 +157,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	ngModule.constant('formlyApiCheck', _providersFormlyApiCheck2['default']);
 	ngModule.constant('formlyErrorAndWarningsUrlPrefix', _otherDocsBaseUrl2['default']);
-	ngModule.constant('formlyVersion', ("8.2.0")); // <-- webpack variable
+	ngModule.constant('formlyVersion', ("8.2.1")); // <-- webpack variable
 
 	ngModule.provider('formlyUsability', _providersFormlyUsability2['default']);
 	ngModule.provider('formlyConfig', _providersFormlyConfig2['default']);
@@ -435,7 +435,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("8.2.0") + "/other/ERRORS_AND_WARNINGS.md#";
+	exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("8.2.1") + "/other/ERRORS_AND_WARNINGS.md#";
 	module.exports = exports["default"];
 
 /***/ },
@@ -668,7 +668,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    if (!_angularFix2['default'].isDefined(extendsDO)) {
 	      return;
 	    }
-	    var optionsDO = options.defaultOptions;
+	    var optionsDO = options.defaultOptions || {};
 	    var optionsDOIsFn = _angularFix2['default'].isFunction(optionsDO);
 	    var extendsDOIsFn = _angularFix2['default'].isFunction(extendsDO);
 	    if (extendsDOIsFn) {
@@ -680,8 +680,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	        if (optionsDOIsFn) {
 	          extenderOptionsDefaultOptions = extenderOptionsDefaultOptions(mergedDefaultOptions, scope);
 	        }
-	        _otherUtils2['default'].reverseDeepMerge(extendsDefaultOptions, extenderOptionsDefaultOptions);
-	        return extendsDefaultOptions;
+	        _otherUtils2['default'].reverseDeepMerge(extenderOptionsDefaultOptions, extendsDefaultOptions);
+	        return extenderOptionsDefaultOptions;
 	      };
 	    } else if (optionsDOIsFn) {
 	      options.defaultOptions = function defaultOptions(opts, scope) {

diff --git a/dist/formly.min.js b/dist/formly.min.js
diff --git a/dist/formly.min.js.map b/dist/formly.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-formly",
-  "version": "8.2.0",
+  "version": "8.2.1",
   "author": "Astrism <astrisms@gmail.com>",
   "contributors": [
     "Astrism <astrisms@gmail.com>",

diff --git a/src/providers/formlyConfig.js b/src/providers/formlyConfig.js
@@ -124,7 +124,7 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,
     if (!angular.isDefined(extendsDO)) {
       return
     }
-    const optionsDO = options.defaultOptions
+    const optionsDO = options.defaultOptions || {}
     const optionsDOIsFn = angular.isFunction(optionsDO)
     const extendsDOIsFn = angular.isFunction(extendsDO)
     if (extendsDOIsFn) {
@@ -136,8 +136,8 @@ function formlyConfig(formlyUsabilityProvider, formlyErrorAndWarningsUrlPrefix,
         if (optionsDOIsFn) {
           extenderOptionsDefaultOptions = extenderOptionsDefaultOptions(mergedDefaultOptions, scope)
         }
-        utils.reverseDeepMerge(extendsDefaultOptions, extenderOptionsDefaultOptions)
-        return extendsDefaultOptions
+        utils.reverseDeepMerge(extenderOptionsDefaultOptions, extendsDefaultOptions)
+        return extenderOptionsDefaultOptions
       }
     } else if (optionsDOIsFn) {
       options.defaultOptions = function defaultOptions(opts, scope) {

diff --git a/src/providers/formlyConfig.test.js b/src/providers/formlyConfig.test.js
@@ -287,6 +287,68 @@ describe('formlyConfig', () => {
           })
 
         })
+
+        describe(`abstractType function case`, () => {
+          beforeEach(() => {
+            setterFn([
+              {
+                name,
+                template,
+                defaultOptions: function(options) {
+                  return {
+                    templateOptions: {
+                      required: true,
+                      min: 3,
+                    },
+                  }
+                },
+              },
+              {
+                name: 'type2',
+                extends: name,
+                defaultOptions: function(options) {
+                  return {
+                    templateOptions: {
+                      required: false,
+                      max: 4,
+                    },
+                  }
+                },
+              },
+              {
+                name: 'type3',
+                extends: name,
+                defaultOptions: {
+                  templateOptions: {
+                    required: false,
+                    max: 4,
+                  },
+                },
+              },
+            ])
+          })
+
+          it(`should merge options when extending defaultOptions is a function`, () => {
+            expect(getterFn('type2').defaultOptions({})).to.eql({
+              templateOptions: {
+                required: false,
+                min: 3,
+                max: 4,
+              },
+            })
+          })
+
+          it(`should merge options when extending defaultOptions is an object`, () => {
+            expect(getterFn('type3').defaultOptions({})).to.eql({
+              templateOptions: {
+                required: false,
+                min: 3,
+                max: 4,
+              },
+            })
+          })
+
+        })
 
         describe(`template/templateUrl Cases`, () => {
           it('should use templateUrl if type defines it and its parent has template defined', function() {