Skip to content
This repository was archived by the owner on Apr 30, 2018. It is now read-only.

Commit d2bce4b

Browse files
author
Kent C. Dodds
committed
6.21.0-beta.1
1 parent ed79403 commit d2bce4b

File tree

4 files changed

+52
-41
lines changed

4 files changed

+52
-41
lines changed

dist/formly.js

Lines changed: 47 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! angular-formly version 6.21.0-beta.0 built with ♥ by Astrism <[email protected]>, Kent C. Dodds <[email protected]> (ó ì_í)=óò=(ì_í ò)
1+
//! angular-formly version 6.21.0-beta.1 built with ♥ by Astrism <[email protected]>, Kent C. Dodds <[email protected]> (ó ì_í)=óò=(ì_í ò)
22

33
(function webpackUniversalModuleDefinition(root, factory) {
44
if(typeof exports === 'object' && typeof module === 'object')
@@ -147,7 +147,7 @@ return /******/ (function(modules) { // webpackBootstrap
147147

148148
ngModule.constant('formlyApiCheck', _providersFormlyApiCheck2['default']);
149149
ngModule.constant('formlyErrorAndWarningsUrlPrefix', _otherDocsBaseUrl2['default']);
150-
ngModule.constant('formlyVersion', ("6.21.0-beta.0")); // <-- webpack variable
150+
ngModule.constant('formlyVersion', ("6.21.0-beta.1")); // <-- webpack variable
151151

152152
ngModule.provider('formlyUsability', _providersFormlyUsability2['default']);
153153
ngModule.provider('formlyConfig', _providersFormlyConfig2['default']);
@@ -345,6 +345,7 @@ return /******/ (function(modules) { // webpackBootstrap
345345
validators: validatorChecker.optional,
346346
asyncValidators: validatorChecker.optional,
347347
parsers: apiCheck.arrayOf(formlyExpression).optional,
348+
formatters: apiCheck.arrayOf(formlyExpression).optional,
348349
noFormControl: apiCheck.bool.optional,
349350
hide: apiCheck.bool.optional,
350351
hideExpression: formlyExpression.optional,
@@ -444,7 +445,7 @@ return /******/ (function(modules) { // webpackBootstrap
444445
Object.defineProperty(exports, "__esModule", {
445446
value: true
446447
});
447-
exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("6.21.0-beta.0") + "/other/ERRORS_AND_WARNINGS.md#";
448+
exports["default"] = "https://github.com/formly-js/angular-formly/blob/" + ("6.21.0-beta.1") + "/other/ERRORS_AND_WARNINGS.md#";
448449
module.exports = exports["default"];
449450

450451
/***/ },
@@ -1539,6 +1540,7 @@ return /******/ (function(modules) { // webpackBootstrap
15391540
stopWatchingShowError();
15401541
addShowMessagesWatcher();
15411542
addParsers();
1543+
addFormatters();
15421544
}
15431545
});
15441546
}
@@ -1566,18 +1568,31 @@ return /******/ (function(modules) { // webpackBootstrap
15661568
}
15671569

15681570
function addParsers() {
1571+
setParsersOrFormatters('parsers');
1572+
}
1573+
1574+
function addFormatters() {
1575+
setParsersOrFormatters('formatters');
1576+
}
1577+
1578+
function setParsersOrFormatters(which) {
1579+
var originalThingProp = 'originalParser';
1580+
if (which === 'formatters') {
1581+
originalThingProp = 'originalFormatter';
1582+
}
1583+
15691584
// init with type's parsers
1570-
var parsers = getParsersFromType(type);
1585+
var things = getThingsFromType(type);
15711586

1572-
// get optionsTypes parsers
1573-
parsers = formlyUtil.extendArray(parsers, getParsersFromOptionsTypes(scope.options.optionsTypes));
1587+
// get optionsTypes things
1588+
things = formlyUtil.extendArray(things, getThingsFromOptionsTypes(scope.options.optionsTypes));
15741589

1575-
// get field's parsers
1576-
parsers = formlyUtil.extendArray(parsers, scope.options.parsers);
1590+
// get field's things
1591+
things = formlyUtil.extendArray(things, scope.options[which]);
15771592

1578-
// convert parsers into formlyExpression parsers
1579-
_angularFix2['default'].forEach(parsers, function (parser, index) {
1580-
parsers[index] = getFormlyExpressionParser(parser);
1593+
// convert things into formlyExpression things
1594+
_angularFix2['default'].forEach(things, function (thing, index) {
1595+
things[index] = getFormlyExpressionThing(thing);
15811596
});
15821597

15831598
var ngModelCtrls = scope.fc;
@@ -1586,51 +1601,51 @@ return /******/ (function(modules) { // webpackBootstrap
15861601
}
15871602

15881603
_angularFix2['default'].forEach(ngModelCtrls, function (ngModelCtrl) {
1589-
var _ngModelCtrl$$parsers;
1604+
var _ngModelCtrl;
15901605

1591-
ngModelCtrl.$parsers = (_ngModelCtrl$$parsers = ngModelCtrl.$parsers).concat.apply(_ngModelCtrl$$parsers, _toConsumableArray(parsers));
1606+
ngModelCtrl['$' + which] = (_ngModelCtrl = ngModelCtrl['$' + which]).concat.apply(_ngModelCtrl, _toConsumableArray(things));
15921607
});
15931608

1594-
function getParsersFromType(theType) {
1609+
function getThingsFromType(theType) {
15951610
if (!theType) {
15961611
return [];
15971612
}
15981613
if (_angularFix2['default'].isString(theType)) {
15991614
theType = formlyConfig.getType(theType, true, scope.options);
16001615
}
1601-
var typeParsers = [];
1616+
var typeThings = [];
16021617

1603-
// get parsers from parent
1618+
// get things from parent
16041619
if (theType['extends']) {
1605-
typeParsers = formlyUtil.extendArray(typeParsers, getParsersFromType(theType['extends']));
1620+
typeThings = formlyUtil.extendArray(typeThings, getThingsFromType(theType['extends']));
16061621
}
16071622

1608-
// get own type's parsers
1609-
typeParsers = formlyUtil.extendArray(typeParsers, getDefaultOptionsParsers(theType));
1623+
// get own type's things
1624+
typeThings = formlyUtil.extendArray(typeThings, getDefaultOptionsProperty(theType, which, []));
16101625

1611-
// get parsers from optionsTypes
1612-
typeParsers = formlyUtil.extendArray(typeParsers, getParsersFromOptionsTypes(getDefaultOptionsOptionsTypes(theType)));
1626+
// get things from optionsTypes
1627+
typeThings = formlyUtil.extendArray(typeThings, getThingsFromOptionsTypes(getDefaultOptionsOptionsTypes(theType)));
16131628

1614-
return typeParsers;
1629+
return typeThings;
16151630
}
16161631

1617-
function getParsersFromOptionsTypes() {
1632+
function getThingsFromOptionsTypes() {
16181633
var optionsTypes = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
16191634

1620-
var optionsTypesParsers = [];
1621-
_angularFix2['default'].forEach(optionsTypes.reverse(), function (optionsTypeName) {
1622-
optionsTypesParsers = formlyUtil.extendArray(optionsTypesParsers, getParsersFromType(optionsTypeName));
1635+
var optionsTypesThings = [];
1636+
_angularFix2['default'].forEach(_angularFix2['default'].copy(arrayify(optionsTypes)).reverse(), function (optionsTypeName) {
1637+
optionsTypesThings = formlyUtil.extendArray(optionsTypesThings, getThingsFromType(optionsTypeName));
16231638
});
1624-
return optionsTypesParsers;
1639+
return optionsTypesThings;
16251640
}
16261641

1627-
function getFormlyExpressionParser(parser) {
1628-
formlyExpressionParserFunction.originalParser = parser;
1629-
return formlyExpressionParserFunction;
1642+
function getFormlyExpressionThing(thing) {
1643+
formlyExpressionParserOrFormatterFunction[originalThingProp] = thing;
1644+
return formlyExpressionParserOrFormatterFunction;
16301645

1631-
function formlyExpressionParserFunction($viewValue) {
1646+
function formlyExpressionParserOrFormatterFunction($viewValue) {
16321647
var $modelValue = scope.options.value();
1633-
return formlyUtil.formlyEval(scope, parser, $modelValue, $viewValue);
1648+
return formlyUtil.formlyEval(scope, thing, $modelValue, $viewValue);
16341649
}
16351650
}
16361651
}
@@ -1894,10 +1909,6 @@ return /******/ (function(modules) { // webpackBootstrap
18941909
formlyField.$inject = ["$http", "$q", "$compile", "$templateCache", "$interpolate", "formlyConfig", "formlyValidationMessages", "formlyApiCheck", "formlyUtil", "formlyUsability", "formlyWarn"];
18951910

18961911
// Stateless util functions
1897-
function getDefaultOptionsParsers(type) {
1898-
return getDefaultOptionsProperty(type, 'parsers', []);
1899-
}
1900-
19011912
function getDefaultOptionsOptionsTypes(type) {
19021913
return getDefaultOptionsProperty(type, 'optionsTypes', []);
19031914
}

dist/formly.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/formly.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-formly",
3-
"version": "6.21.0-beta.0",
3+
"version": "6.21.0-beta.1",
44
"author": "Astrism <[email protected]>",
55
"contributors": [
66
"Astrism <[email protected]>",

0 commit comments

Comments
 (0)